summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-04-08 23:59:39 +0200
committerCarl Hetherington <cth@carlh.net>2024-04-22 13:03:04 +0200
commitf762833c3348003df6d0c026582776a6e577cf76 (patch)
treecbc0b71868fe245f72da00883902df8db39c0761
parente530ee820c64828fed7b6fc1b613e57bc0968120 (diff)
Don't emit video until film's end if we are seeking.
Otherwise if we seek to the frame just before the end of the DCP we'll call emit_video_until() with _next_video unset, causing that method to emit video for the whole film. The point of this emit_video_until() call is only to pad a space between the end of the video content and the end of the film.
-rw-r--r--src/lib/player.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc
index dba02cfba..913d7392f 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -887,8 +887,10 @@ Player::pass ()
}
if (done) {
- LOG_DEBUG_PLAYER("Done: emit video until end of film at %1", to_string(film->length()));
- emit_video_until(film->length());
+ if (_next_video_time) {
+ LOG_DEBUG_PLAYER("Done: emit video until end of film at %1", to_string(film->length()));
+ emit_video_until(film->length());
+ }
if (_shuffler) {
_shuffler->flush ();