Fix for wrong reel-sizes under trim; like 54ca9edc8d6cfc6f7175986d5df21bc101663576...

diff --git a/src/lib/player.cc b/src/lib/player.cc
index c7d7b2f441ddd4aff76d4cdd7ee6ee2667e108c7..5515b70e85a809fd8f767d911dcb48609ba7e656 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -546,7 +546,7 @@ Player::pass ()
                        continue;
                }
 
-               DCPTime const t = content_time_to_dcp (i, i->decoder->position());
+               DCPTime const t = content_time_to_dcp (i, max(i->decoder->position(), i->content->trim_start()));
                if (t > i->content->end()) {
                        i->done = true;
                } else {