Merge master.

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

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index 498ff2e25dc026dad8000fd956ce0645a5bb71f5..5de0c8582facb1aca80ed8d03479bdf2928331d4 100644 (file)
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -30,30 +30,39 @@
 
 using std::cout;
 using boost::shared_ptr;
-using libdcp::Size;
+using dcp::Size;
 
-ImageDecoder::ImageDecoder (shared_ptr<const Film> f, shared_ptr<const ImageContent> c)
-       : Decoder (f)
-       , VideoDecoder (f, c)
+ImageDecoder::ImageDecoder (shared_ptr<const ImageContent> c)
+       : VideoDecoder (c)
        , _image_content (c)
 {
 
 }
 
-void
+bool
 ImageDecoder::pass ()
 {
-       if (_video_position >= _image_content->video_length ()) {
-               return;
+       if (_video_position >= _image_content->video_length().frames (_image_content->video_frame_rate ())) {
+               return true;
        }
 
        if (_image && _image_content->still ()) {
-               video (_image, true, _video_position);
-               return;
+               video (_image, _video_position);
+               ++_video_position;
+               return false;
        }
 
-       Magick::Image* magick_image = new Magick::Image (_image_content->path(_video_position).string ());
-       libdcp::Size size (magick_image->columns(), magick_image->rows());
+       Magick::Image* magick_image = 0;
+
+       boost::filesystem::path const path = _image_content->path (_image_content->still() ? 0 : _video_position);
+       
+       try {
+               magick_image = new Magick::Image (path.string ());
+       } catch (...) {
+               throw OpenFileError (path);
+       }
+       
+       dcp::Size size (magick_image->columns(), magick_image->rows());
 
        _image.reset (new Image (PIX_FMT_RGB24, size, true));
 
@@ -73,17 +82,15 @@ ImageDecoder::pass ()
 
        delete magick_image;
 
-       video (_image, false, _video_position);
-}
+       video (_image, _video_position);
+       ++_video_position;
 
-void
-ImageDecoder::seek (VideoContent::Frame frame, bool)
-{
-       _video_position = frame;
+       return false;
 }
 
-bool
-ImageDecoder::done () const
+void
+ImageDecoder::seek (ContentTime time, bool accurate)
 {
-       return _video_position >= _image_content->video_length ();
+       VideoDecoder::seek (time, accurate);
+       _video_position = time.frames (_image_content->video_frame_rate ());
 }