summaryrefslogtreecommitdiff
path: root/src/lib/image_decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-11-21 16:57:15 +0000
committerCarl Hetherington <cth@carlh.net>2017-04-19 23:04:32 +0100
commitde2af791bdfdcd653752cba970e59efc7bf810c7 (patch)
tree1aa5dbc35daee0babd0def347944a6bea4154deb /src/lib/image_decoder.cc
parent06152300e69e8faca44ff8d7f12a6fd354848b9a (diff)
Basic grunt-work, untested and unfinished, but it compiles.
Diffstat (limited to 'src/lib/image_decoder.cc')
-rw-r--r--src/lib/image_decoder.cc14
1 files changed, 7 insertions, 7 deletions
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<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 ());
}