X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimagemagick_decoder.h;h=7ad08df03a2e82f131ebbede586e890e00c34ba6;hb=6809fdcbf8c65afe3c986b0e2b430d55ce7b124c;hp=de49c1b566b6ef0a36ae2bb44c0e05d77a65da6c;hpb=0b781dd65a90e617866810ecb3dee27267449f1f;p=dcpomatic.git

diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index de49c1b56..7ad08df03 100644
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -23,19 +23,21 @@ 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;
 
-	SourceFrame length () const {
+	ContentVideoFrame video_length () const {
 		/* We don't know */
 		return 0;
 	}
@@ -52,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 {
@@ -79,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;
 };