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

diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index c4795b003..7ad08df03 100644
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -23,10 +23,12 @@ namespace Magick {
 	class Image;
 }
 
+class ImageMagickContent;
+
 class ImageMagickDecoder : public VideoDecoder
 {
 public:
-	ImageMagickDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const DecodeOptions>, Job *);
+	ImageMagickDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const ImageMagickContent>);
 
 	float frames_per_second () const {
 		/* We don't know */
@@ -35,7 +37,7 @@ public:
 
 	libdcp::Size native_size () const;
 
-	SourceFrame length () const {
+	ContentVideoFrame video_length () const {
 		/* We don't know */
 		return 0;
 	}
@@ -52,15 +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 {
@@ -83,7 +81,7 @@ protected:
 
 private:
 	void film_changed (Film::Property);
-	
-	std::list<std::string> _files;
-	std::list<std::string>::iterator _iter;
+
+	boost::shared_ptr<const ImageMagickContent> _imagemagick_content;
+	ContentVideoFrame _position;
 };