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 75107ef4febea666c1c7697f539edc2f543bfcf3..80a08f81f8374a3126a425ee413d0c0eedf21e29 100644 (file)
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -26,15 +26,17 @@ namespace Magick {
 class ImageMagickDecoder : public VideoDecoder
 {
 public:
-       ImageMagickDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const DecodeOptions>, Job *);
+       ImageMagickDecoder (boost::shared_ptr<Film>, DecodeOptions);
 
-       float frames_per_second () const {
+       float frames_per_second () const;
+
+       libdcp::Size native_size () const;
+
+       SourceFrame length () const {
                /* We don't know */
                return 0;
        }
 
-       Size native_size () const;
-
        int audio_channels () const {
                return 0;
        }
@@ -47,9 +49,8 @@ public:
                return 0;
        }
 
-       bool has_subtitles () const {
-               return false;
-       }
+       bool seek (double);
+       bool seek_to_last ();
 
 protected:
        bool pass ();
@@ -74,6 +75,10 @@ protected:
        }
 
 private:
+       void film_changed (Film::Property);
+       
        std::list<std::string> _files;
        std::list<std::string>::iterator _iter;
+
+       boost::shared_ptr<Image> _image;
 };