summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/player.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 7e0186bf4..c94e0b549 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -557,7 +557,11 @@ Player::pass ()
continue;
}
- DCPTime const t = content_time_to_dcp (i, i->decoder->position());
+ /** decoder position may need to be trimmed like the
+ content (but the decoder does not know it yet);
+ check for that and fake it here if necessary.
+ */
+ DCPTime const t = content_time_to_dcp (i, min(i->decoder->position(), i->content->trim_start()));
if (t > i->content->end()) {
i->done = true;
} else {