X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimagemagick_decoder.cc;h=5ce22c29622a403c33425a5ce6e8e9a5f3e26de5;hb=37258f4ee74582feaac8b311baaeb27bf5f17ac9;hp=bab4f2f072f1b19c0dad60958936f1f8a0061db5;hpb=39c65e47432c76a4e34aaea5317bd7362409aed0;p=dcpomatic.git

diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index bab4f2f07..5ce22c296 100644
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -25,14 +25,16 @@
 #include "film.h"
 #include "exceptions.h"
 
+#include "i18n.h"
+
 using std::cout;
 using boost::shared_ptr;
 using libdcp::Size;
 
 ImageMagickDecoder::ImageMagickDecoder (
-	boost::shared_ptr<Film> f, DecodeOptions o, Job* j)
-	: Decoder (f, o, j)
-	, VideoDecoder (f, o, j)
+	boost::shared_ptr<Film> f, DecodeOptions o)
+	: Decoder (f, o)
+	, VideoDecoder (f, o)
 {
 	if (boost::filesystem::is_directory (_film->content_path())) {
 		for (
@@ -51,17 +53,17 @@ ImageMagickDecoder::ImageMagickDecoder (
 	_iter = _files.begin ();
 }
 
-Size
+libdcp::Size
 ImageMagickDecoder::native_size () const
 {
 	if (_files.empty ()) {
-		throw DecodeError ("no still image files found");
+		throw DecodeError (_("no still image files found"));
 	}
 
 	/* Look at the first file and assume its size holds for all */
 	using namespace MagickCore;
 	Magick::Image* image = new Magick::Image (_film->content_path ());
-	Size const s = Size (image->columns(), image->rows());
+	libdcp::Size const s = libdcp::Size (image->columns(), image->rows());
 	delete image;
 
 	return s;
@@ -75,13 +77,13 @@ ImageMagickDecoder::pass ()
 			return true;
 		}
 
-		repeat_last_video ();
+		emit_video (_image, true, double (video_frame()) / frames_per_second());
 		return false;
 	}
 	
 	Magick::Image* magick_image = new Magick::Image (_film->content_path ());
 	
-	Size size = native_size ();
+	libdcp::Size size = native_size ();
 	shared_ptr<Image> image (new SimpleImage (PIX_FMT_RGB24, size, false));
 
 	using namespace MagickCore;
@@ -98,9 +100,9 @@ ImageMagickDecoder::pass ()
 
 	delete magick_image;
 
-	image = image->crop (_film->crop(), false);
-	
-	emit_video (image, 0);
+	_image = image->crop (_film->crop(), true);
+
+	emit_video (_image, false, double (video_frame()) / frames_per_second());
 
 	++_iter;
 	return false;
@@ -148,3 +150,9 @@ ImageMagickDecoder::film_changed (Film::Property p)
 		OutputChanged ();
 	}
 }
+
+float
+ImageMagickDecoder::frames_per_second () const
+{
+	return _film->source_frame_rate ();
+}