X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimagemagick_decoder.h;h=7ad08df03a2e82f131ebbede586e890e00c34ba6;hb=db468a15e50c8491d4b8462ad0676be905f49065;hp=f636191f2e3bdbb6da13d799c13a496cabbd6885;hpb=288e7e64e9be84b8dbe11f5acb490e64a29d9378;p=dcpomatic.git

diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index f636191f2..7ad08df03 100644
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -23,17 +23,24 @@ namespace Magick {
 	class Image;
 }
 
+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<const ImageMagickContent>);
 
 	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<const ImageMagickContent> _imagemagick_content;
+	ContentVideoFrame _position;
 };