X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_decoder.cc;h=2291daecd7996f85e00ad9bdc7d6cc9a96e8be90;hb=6fde557864505b470c438e4161ee494f29b90d63;hp=78201fc23d9d7b838d30ed6edbb0d09e4c258369;hpb=9d1fb717654dc38e9412d99bb84efdbced2e03ac;p=dcpomatic.git diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc index 78201fc23..2291daecd 100644 --- a/src/lib/image_decoder.cc +++ b/src/lib/image_decoder.cc @@ -43,9 +43,9 @@ ImageDecoder::ImageDecoder (shared_ptr c) } bool -ImageDecoder::pass () +ImageDecoder::pass (PassReason, bool) { - if (_video_position >= _image_content->video_length().frames (_image_content->video_frame_rate ())) { + if (_video_position >= _image_content->video_length()) { return true; } @@ -61,7 +61,7 @@ ImageDecoder::pass () _image.reset (new MagickImageProxy (path)); } } - + video (_image, _video_position); ++_video_position; return false; @@ -71,5 +71,5 @@ void ImageDecoder::seek (ContentTime time, bool accurate) { VideoDecoder::seek (time, accurate); - _video_position = time.frames (_image_content->video_frame_rate ()); + _video_position = time.frames_round (_image_content->video_frame_rate ()); }