From de2af791bdfdcd653752cba970e59efc7bf810c7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 21 Nov 2016 16:57:15 +0000 Subject: Basic grunt-work, untested and unfinished, but it compiles. --- src/lib/image_decoder.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/lib/image_decoder.cc') diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc index dae73663c..b0841688f 100644 --- a/src/lib/image_decoder.cc +++ b/src/lib/image_decoder.cc @@ -44,11 +44,11 @@ ImageDecoder::ImageDecoder (shared_ptr c, shared_ptr 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 ()); } -- cgit v1.2.3