Merge branch 'master' into trimming

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

diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index cfcf4b4f6d130d8b2ea2cfeedf0362f59bda4daa..2f4e2c9677a64e9a162f49a27645be9561f0840b 100644 (file)
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -26,14 +26,14 @@ 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 {
                /* We don't know */
                return 0;
        }
 
-       Size native_size () const;
+       libdcp::Size native_size () const;
 
        SourceFrame length () const {
                /* We don't know */
@@ -52,9 +52,8 @@ public:
                return 0;
        }
 
-       bool has_subtitles () const {
-               return false;
-       }
+       bool seek (double);
+       bool seek_to_last ();
 
 protected:
        bool pass ();
@@ -79,6 +78,8 @@ protected:
        }
 
 private:
+       void film_changed (Film::Property);
+       
        std::list<std::string> _files;
        std::list<std::string>::iterator _iter;
 };