Runs.

[dcpomatic.git] / src / lib / imagemagick_decoder.h

diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index 84a6f15f9aa8b63d762ada2deb5ac94ccd756646..b04bd88b10bba16d893769e0991656331b1c5da8 100644 (file)
--- 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>, DecodeOptions, Job *);
+       ImageMagickDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<ImageMagickContent>, DecodeOptions);
 
        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<ImageMagickContent> _imagemagick_content;
+       ContentVideoFrame _position;
 };