X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimagemagick_decoder.h;fp=src%2Flib%2Fimagemagick_decoder.h;h=e7c9dee9a3ac35373668433e6208d02128aafc0a;hp=80a08f81f8374a3126a425ee413d0c0eedf21e29;hb=47f25009bcbc765e397bcb471dd361a511c99daf;hpb=e8d8a27c7f6861b031b3250b0ad50d04c41a7721

diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index 80a08f81f..e7c9dee9a 100644
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -23,37 +23,24 @@ namespace Magick {
 	class Image;
 }
 
+class ImageMagickContent;
+
 class ImageMagickDecoder : public VideoDecoder
 {
 public:
-	ImageMagickDecoder (boost::shared_ptr<Film>, DecodeOptions);
-
-	float frames_per_second () const;
+	ImageMagickDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const ImageMagickContent>);
 
-	libdcp::Size native_size () const;
-
-	SourceFrame length () const {
-		/* We don't know */
-		return 0;
+	float video_frame_rate () const {
+		return 24;
 	}
 
-	int audio_channels () const {
-		return 0;
-	}
-
-	int audio_sample_rate () const {
-		return 0;
-	}
-
-	int64_t audio_channel_layout () const {
-		return 0;
-	}
+	libdcp::Size native_size () const;
+	ContentVideoFrame video_length () const;
 
 	bool seek (double);
-	bool seek_to_last ();
+	bool pass ();
 
 protected:
-	bool pass ();
 	PixelFormat pixel_format () const;
 
 	int time_base_numerator () const {
@@ -75,10 +62,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;
 	boost::shared_ptr<Image> _image;
+	ContentVideoFrame _position;
 };