Merge master.

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

diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index cb524b44ba2bad08b9fabcde78f7a815d72ccfa3..cb68655cee2f2a6362dc3be6d0089d095db5b2d9 100644 (file)
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -37,22 +37,13 @@ public:
        libdcp::Size native_size () const;
        ContentVideoFrame video_length () const;
 
-       int audio_channels () const {
-               return 0;
-       }
-
-       int audio_sample_rate () const {
-               return 0;
-       }
-
-       int64_t audio_channel_layout () const {
-               return 0;
-       }
-
        bool seek (double);
-       bool seek_to_last ();
        bool pass ();
 
+       boost::shared_ptr<const ImageMagickContent> content () const {
+               return _imagemagick_content;
+       }
+
 protected:
        PixelFormat pixel_format () const;
 
@@ -76,5 +67,7 @@ protected:
 
 private:
        boost::shared_ptr<const ImageMagickContent> _imagemagick_content;
+       boost::shared_ptr<Image> _image;
        ContentVideoFrame _position;
+       mutable boost::optional<libdcp::Size> _native_size;
 };