Untested merge of master.

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

diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index 6a2be1a7ca720560666d955da64eb5651c7eeef2..3888347ca73329359192539aa81a21fd3cc3e1ca 100644 (file)
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -65,8 +65,8 @@ ImageMagickDecoder::pass ()
                return true;
        }
 
-       if (have_last_video ()) {
-               repeat_last_video (double (_position) / 24);
+       if (_image) {
+               emit_video (_image, true, double (_position) / 24);
                _position++;
                return false;
        }
@@ -74,11 +74,11 @@ ImageMagickDecoder::pass ()
        Magick::Image* magick_image = new Magick::Image (_imagemagick_content->file().string ());
        
        libdcp::Size size = native_size ();
-       shared_ptr<Image> image (new SimpleImage (PIX_FMT_RGB24, size, false));
+       _image.reset (new SimpleImage (PIX_FMT_RGB24, size, false));
 
        using namespace MagickCore;
        
-       uint8_t* p = image->data()[0];
+       uint8_t* p = _image->data()[0];
        for (int y = 0; y < size.height; ++y) {
                for (int x = 0; x < size.width; ++x) {
                        Magick::Color c = magick_image->pixelColor (x, y);
@@ -90,9 +90,8 @@ ImageMagickDecoder::pass ()
 
        delete magick_image;
 
-       image = image->crop (_film->crop(), true);
-       
-       emit_video (image, double (_position) / 24);
+       _image = _image->crop (_film->crop(), true);
+       emit_video (_image, false, double (_position) / 24);
 
        ++_position;
        return false;
@@ -105,16 +104,6 @@ ImageMagickDecoder::pixel_format () const
        return PIX_FMT_RGB24;
 }
 
-bool
-ImageMagickDecoder::seek_to_last ()
-{
-       if (_position > 0) {
-               --_position;
-       }
-
-       return false;
-}
-
 bool
 ImageMagickDecoder::seek (double t)
 {