Merge master.

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

diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index aa3c64f931f7e4e48d241cab70ef1ec01b1ec872..6a2be1a7ca720560666d955da64eb5651c7eeef2 100644 (file)
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -32,10 +32,9 @@ using std::cout;
 using boost::shared_ptr;
 using libdcp::Size;
 
-ImageMagickDecoder::ImageMagickDecoder (
-       shared_ptr<const Film> f, shared_ptr<ImageMagickContent> c, DecodeOptions o)
-       : Decoder (f, o)
-       , VideoDecoder (f, c, o)
+ImageMagickDecoder::ImageMagickDecoder (shared_ptr<const Film> f, shared_ptr<const ImageMagickContent> c)
+       : Decoder (f)
+       , VideoDecoder (f)
        , _imagemagick_content (c)
        , _position (0)
 {
@@ -53,15 +52,23 @@ ImageMagickDecoder::native_size () const
        return s;
 }
 
+int
+ImageMagickDecoder::video_length () const
+{
+       return _imagemagick_content->video_length ();
+}
+
 bool
 ImageMagickDecoder::pass ()
 {
-       if (_position > 0 && _position < _imagemagick_content->video_length ()) {
-               repeat_last_video ();
+       if (_position < 0 || _position >= _imagemagick_content->video_length ()) {
+               return true;
+       }
+
+       if (have_last_video ()) {
+               repeat_last_video (double (_position) / 24);
                _position++;
                return false;
-       } else if (_position >= _imagemagick_content->video_length ()) {
-               return true;
        }
        
        Magick::Image* magick_image = new Magick::Image (_imagemagick_content->file().string ());
@@ -85,7 +92,7 @@ ImageMagickDecoder::pass ()
 
        image = image->crop (_film->crop(), true);
        
-       emit_video (image, 0);
+       emit_video (image, double (_position) / 24);
 
        ++_position;
        return false;
@@ -121,11 +128,3 @@ ImageMagickDecoder::seek (double t)
        _position = f;
        return false;
 }
-
-void
-ImageMagickDecoder::film_changed (Film::Property p)
-{
-       if (p == Film::CROP) {
-               OutputChanged ();
-       }
-}