X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimagemagick_decoder.h;h=b04bd88b10bba16d893769e0991656331b1c5da8;hb=127672223cca569986e35c91265e269ed5a6561c;hp=6506d0177f1196667eccfe7d8eab5dbb6680f3f3;hpb=967dc3f4461d4b8caf809ebce7bdcb6e818809f0;p=dcpomatic.git

diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index 6506d0177..b04bd88b1 100644
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -17,23 +17,30 @@
 
 */
 
-#include "decoder.h"
+#include "video_decoder.h"
 
 namespace Magick {
 	class Image;
 }
 
-class ImageMagickDecoder : public Decoder
+class ImageMagickContent;
+
+class ImageMagickDecoder : public VideoDecoder
 {
 public:
-	ImageMagickDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *);
+	ImageMagickDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<ImageMagickContent>, DecodeOptions);
 
 	float frames_per_second () const {
 		/* We don't know */
 		return 0;
 	}
 
-	Size native_size () const;
+	libdcp::Size native_size () const;
+
+	ContentVideoFrame video_length () const {
+		/* We don't know */
+		return 0;
+	}
 
 	int audio_channels () const {
 		return 0;
@@ -47,12 +54,11 @@ public:
 		return 0;
 	}
 
-	bool has_subtitles () const {
-		return false;
-	}
+	bool seek (double);
+	bool seek_to_last ();
+	bool pass ();
 
 protected:
-	bool pass ();
 	PixelFormat pixel_format () const;
 
 	int time_base_numerator () const {
@@ -74,6 +80,8 @@ protected:
 	}
 
 private:
-	std::list<std::string> _files;
-	std::list<std::string>::iterator _iter;
+	void film_changed (Film::Property);
+
+	boost::shared_ptr<ImageMagickContent> _imagemagick_content;
+	ContentVideoFrame _position;
 };