From: Carl Hetherington Date: Tue, 16 Aug 2016 13:30:53 +0000 (+0100) Subject: Fix seek through multi-reel DCP imports. X-Git-Tag: v2.9.13~22 X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=214843a6753b1b8b09789416c0c88e37e7ba039b;p=dcpomatic.git Fix seek through multi-reel DCP imports. --- diff --git a/ChangeLog b/ChangeLog index 2440e7b90..c6d270897 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2016-08-16 c.hetherington + * Fix error on seeking through imported mulit-reel DCPs. + * Simple information on mouse position in the video waveform (part of #932). 2016-08-15 Carl Hetherington diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index 283cb2905..a4207f144 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -216,8 +216,10 @@ DCPDecoder::seek (ContentTime t, bool accurate) audio->seek (t, accurate); subtitle->seek (t, accurate); - _offset = 0; _reel = _reels.begin (); + _offset = 0; + get_readers (); + while (_reel != _reels.end() && t >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ())) { t -= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ()); next_reel ();