Basic grunt-work, untested and unfinished, but it compiles.

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

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index dae73663c7f20104e448d67916aafcfec161d09f..b0841688fb23d11114b5af019636f9ab5c301f16 100644 (file)
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -44,11 +44,11 @@ ImageDecoder::ImageDecoder (shared_ptr<const ImageContent> c, shared_ptr<Log> lo
        video.reset (new VideoDecoder (this, c, log));
 }
 
-bool
-ImageDecoder::pass (PassReason, bool)
+void
+ImageDecoder::pass ()
 {
        if (_frame_video_position >= _image_content->video->length()) {
-               return true;
+               return;
        }
 
        if (!_image_content->still() || !_image) {
@@ -72,14 +72,14 @@ ImageDecoder::pass (PassReason, bool)
                }
        }
 
-       video->give (_image, _frame_video_position);
+       video->set_position (ContentTime::from_frames (_frame_video_position, _image_content->active_video_frame_rate ()));
+       video->emit (_image, _frame_video_position);
        ++_frame_video_position;
-       return false;
+       return;
 }
 
 void
-ImageDecoder::seek (ContentTime time, bool accurate)
+ImageDecoder::seek (ContentTime time, bool)
 {
-       video->seek (time, accurate);
        _frame_video_position = time.frames_round (_image_content->active_video_frame_rate ());
 }