Merge branch 'master' of ssh://houllier/home/carl/git/dvdomatic

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

diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index 13b53b68523be8f9df2b4a63d293f149d7cc4fe7..80a08f81f8374a3126a425ee413d0c0eedf21e29 100644 (file)
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -17,49 +17,43 @@
 
 */
 
-#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 *, bool, bool);
+       ImageMagickDecoder (boost::shared_ptr<Film>, DecodeOptions);
 
-       float frames_per_second () const {
-               return static_frames_per_second ();
-       }
+       float frames_per_second () const;
 
-       Size native_size () const;
+       libdcp::Size native_size () const;
 
-       int audio_channels () const {
+       SourceFrame length () const {
+               /* We don't know */
                return 0;
        }
 
-       int audio_sample_rate () const {
+       int audio_channels () const {
                return 0;
        }
 
-       AVSampleFormat audio_sample_format () const {
-               return AV_SAMPLE_FMT_NONE;
+       int audio_sample_rate () const {
+               return 0;
        }
 
        int64_t audio_channel_layout () const {
                return 0;
        }
 
-       bool has_subtitles () const {
-               return false;
-       }
-
-       static float static_frames_per_second () {
-               return 24;
-       }
+       bool seek (double);
+       bool seek_to_last ();
 
 protected:
-       bool do_pass ();
+       bool pass ();
        PixelFormat pixel_format () const;
 
        int time_base_numerator () const {
@@ -81,6 +75,10 @@ protected:
        }
 
 private:
-       Magick::Image* _magick_image;
-       bool _done;
+       void film_changed (Film::Property);
+       
+       std::list<std::string> _files;
+       std::list<std::string>::iterator _iter;
+
+       boost::shared_ptr<Image> _image;
 };