Fix confusion over when DCPDecoder::_next means wrt reels.

2 files changed, 2 insertions, 0 deletions

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 04fffb981..c968259b3 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -131,6 +131,7 @@ DCPDecoder::pass (PassReason reason, bool)
 	if ((*_reel)->main_picture ()) {
 		if (_next.frames_round (vfr) >= (*_reel)->main_picture()->duration()) {
 			++_reel;
+			_next = ContentTime ();
 		}
 	}
 
diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index 0db707160..32d334ec1 100644
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -50,6 +50,7 @@ private:
 	std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
 	std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
 
+	/** Time of next thing to return from pass relative to the start of _reel */
 	ContentTime _next;
 	std::list<boost::shared_ptr<dcp::Reel> > _reels;
 	std::list<boost::shared_ptr<dcp::Reel> >::iterator _reel;