Time -> DCPTime.

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

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index 498ff2e25dc026dad8000fd956ce0645a5bb71f5..723690247c1ee380f9cffa08f1cd6547501f5393 100644 (file)
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -52,7 +52,7 @@ ImageDecoder::pass ()
                return;
        }
 
-       Magick::Image* magick_image = new Magick::Image (_image_content->path(_video_position).string ());
+       Magick::Image* magick_image = new Magick::Image (_image_content->path (_image_content->still() ? 0 : _video_position).string ());
        libdcp::Size size (magick_image->columns(), magick_image->rows());
 
        _image.reset (new Image (PIX_FMT_RGB24, size, true));
@@ -77,9 +77,9 @@ ImageDecoder::pass ()
 }
 
 void
-ImageDecoder::seek (VideoContent::Frame frame, bool)
+ImageDecoder::seek (DCPTime time, bool)
 {
-       _video_position = frame;
+       _video_position = _video_content->time_to_content_video_frames (time);
 }
 
 bool