Try to move J2K bandwidth and colour LUT to be per-film (#23).

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

diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index 1bf50378bc3788bbc723f9c2ad79750582cd272f..6f426f308058a403330af912baa0acdc7d58b281 100644 (file)
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -17,23 +17,29 @@
 
 */
 
-#include "decoder.h"
+#include "video_decoder.h"
 
 namespace Magick {
        class Image;
 }
 
-class ImageMagickDecoder : public Decoder
+class ImageMagickDecoder : public VideoDecoder
 {
 public:
-       ImageMagickDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *);
+       ImageMagickDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const DecodeOptions>, Job *);
 
        float frames_per_second () const {
-               return static_frames_per_second ();
+               /* We don't know */
+               return 0;
        }
 
        Size native_size () const;
 
+       SourceFrame length () const {
+               /* We don't know */
+               return 0;
+       }
+
        int audio_channels () const {
                return 0;
        }
@@ -50,9 +56,8 @@ public:
                return false;
        }
 
-       static float static_frames_per_second () {
-               return 24;
-       }
+       bool seek (double);
+       bool seek_to_last ();
 
 protected:
        bool pass ();
@@ -77,6 +82,8 @@ protected:
        }
 
 private:
-       Magick::Image* _magick_image;
-       bool _done;
+       void film_changed (Film::Property);
+       
+       std::list<std::string> _files;
+       std::list<std::string>::iterator _iter;
 };