summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-05-08 15:36:54 +0100
committerCarl Hetherington <cth@carlh.net>2017-05-08 15:36:54 +0100
commit7844347e7d89ffb256167192fb414c35d416e14d (patch)
treedc73c296780e71866a7ff32f2e11168ba55ec13d /src
parentfefa8053a9921bb309aa856a6e1b305a8cba6a12 (diff)
Correctly stop when we have no decoders and we haven't filled.
Diffstat (limited to 'src')
-rw-r--r--src/lib/player.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc
index fd83886db..a186202db 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -549,13 +549,16 @@ Player::pass ()
fill_from = _last_seek_time;
}
+ bool filled = false;
if (fill_from && ((fill_towards - fill_from.get())) > one_video_frame()) {
emit_video (black_player_video_frame(), fill_from.get());
+ filled = true;
} else if (_playlist->length() == DCPTime()) {
emit_video (black_player_video_frame(), DCPTime());
+ filled = true;
}
- if (!earliest && !fill_from) {
+ if (!earliest && !filled) {
return true;
}