diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-08-16 14:30:53 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-08-16 14:30:53 +0100 |
| commit | 214843a6753b1b8b09789416c0c88e37e7ba039b (patch) | |
| tree | 7007e12666601514612cff8807374ea1d5e681ac | |
| parent | 4aa2c70aa6b240d426f782b215749bee7399d6c4 (diff) | |
Fix seek through multi-reel DCP imports.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/lib/dcp_decoder.cc | 4 |
2 files changed, 5 insertions, 1 deletions
@@ -1,5 +1,7 @@ 2016-08-16 c.hetherington <cth@carlh.net> + * 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 <cth@carlh.net> 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 (); |