Try a bit of backwards compatibility in state file.

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

diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index b7ab9af18119cf0c1677d3c6a0993f2b48335463..6506d0177f1196667eccfe7d8eab5dbb6680f3f3 100644 (file)
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -29,7 +29,8 @@ public:
        ImageMagickDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *);
 
        float frames_per_second () const {
-               return static_frames_per_second ();
+               /* We don't know */
+               return 0;
        }
 
        Size native_size () const;
@@ -42,10 +43,6 @@ public:
                return 0;
        }
 
-       AVSampleFormat audio_sample_format () const {
-               return AV_SAMPLE_FMT_NONE;
-       }
-
        int64_t audio_channel_layout () const {
                return 0;
        }
@@ -54,10 +51,6 @@ public:
                return false;
        }
 
-       static float static_frames_per_second () {
-               return 24;
-       }
-
 protected:
        bool pass ();
        PixelFormat pixel_format () const;
@@ -81,6 +74,6 @@ protected:
        }
 
 private:
-       Magick::Image* _magick_image;
-       bool _done;
+       std::list<std::string> _files;
+       std::list<std::string>::iterator _iter;
 };