Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index 250c8f845b6c2f10141aac2c3c46dd2e7fe55dbd..db7c5401fa3591c536fdf6083bf0a159e366e255 100644 (file)
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -43,9 +43,9 @@ ImageDecoder::ImageDecoder (shared_ptr<const ImageContent> c)
 }
 
 bool
-ImageDecoder::pass (PassReason)
+ImageDecoder::pass ()
 {
-       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 (PassReason)
                        _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 ());
 }