projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2537a2d
)
Mark pieces as done when we're past the end of them; fixes #1154.
author
Carl Hetherington
<cth@carlh.net>
Tue, 2 Jan 2018 21:21:43 +0000
(21:21 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 2 Jan 2018 21:21:43 +0000
(21:21 +0000)
src/lib/player.cc
patch
|
blob
|
history
diff --git
a/src/lib/player.cc
b/src/lib/player.cc
index 9e0561a7051dbc2fb8be976a118b93eddbc49b76..df0b955a8a392170bd923b2b493fe7c9f827f44a 100644
(file)
--- a/
src/lib/player.cc
+++ b/
src/lib/player.cc
@@
-526,8
+526,14
@@
Player::pass ()
optional<DCPTime> earliest_time;
BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
- if (!i->done) {
- DCPTime const t = content_time_to_dcp (i, i->decoder->position());
+ if (i->done) {
+ continue;
+ }
+
+ DCPTime const t = content_time_to_dcp (i, i->decoder->position());
+ if (t > i->content->end()) {
+ i->done = true;
+ } else {
/* Given two choices at the same time, pick the one with a subtitle so we see it before
the video.
*/