Set up seek position correctly when a seek skips over a reel in

[dcpomatic.git] / src / lib / dcp_decoder.cc

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index c1c7780bb8c782346bb87474d421b0eb42fc1b2d..b49081dfeb303af13b8d0cfbc9370d8bcdc8b3ff 100644 (file)
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -259,30 +259,30 @@ DCPDecoder::seek (ContentTime t, bool accurate)
        _offset = 0;
        get_readers ();
 
-       if (accurate) {
-               int const pre_roll_seconds = 2;
+       int const pre_roll_seconds = 2;
 
-               /* Pre-roll for subs */
+       /* Pre-roll for subs */
 
-               ContentTime pre = t - ContentTime::from_seconds (pre_roll_seconds);
-               if (pre < ContentTime()) {
-                       pre = ContentTime ();
-               }
+       ContentTime pre = t - ContentTime::from_seconds (pre_roll_seconds);
+       if (pre < ContentTime()) {
+               pre = ContentTime ();
+       }
 
-               /* Seek to pre-roll position */
+       /* Seek to pre-roll position */
 
-               while (_reel != _reels.end() && pre >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ())) {
-                       pre -= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ());
-                       next_reel ();
-               }
+       while (_reel != _reels.end() && pre >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ())) {
+               ContentTime rd = ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ());
+               pre -= rd;
+               t -= rd;
+               next_reel ();
+       }
 
-               /* Pass subtitles in the pre-roll */
+       /* Pass subtitles in the pre-roll */
 
-               double const vfr = _dcp_content->active_video_frame_rate ();
-               for (int i = 0; i < pre_roll_seconds * vfr; ++i) {
-                       pass_subtitles (pre);
-                       pre += ContentTime::from_frames (1, vfr);
-               }
+       double const vfr = _dcp_content->active_video_frame_rate ();
+       for (int i = 0; i < pre_roll_seconds * vfr; ++i) {
+               pass_subtitles (pre);
+               pre += ContentTime::from_frames (1, vfr);
        }
 
        /* Seek to correct position */