Make batch converter basically work.

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

diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index 6f426f308058a403330af912baa0acdc7d58b281..80a08f81f8374a3126a425ee413d0c0eedf21e29 100644 (file)
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -26,14 +26,11 @@ 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;
-       }
+       float frames_per_second () const;
 
-       Size native_size () const;
+       libdcp::Size native_size () const;
 
        SourceFrame length () const {
                /* We don't know */
@@ -52,10 +49,6 @@ public:
                return 0;
        }
 
-       bool has_subtitles () const {
-               return false;
-       }
-
        bool seek (double);
        bool seek_to_last ();
 
@@ -86,4 +79,6 @@ private:
        
        std::list<std::string> _files;
        std::list<std::string>::iterator _iter;
+
+       boost::shared_ptr<Image> _image;
 };