Merge master.

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

diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index 12a40976b5b72e1ab148a3269e798ada81a79775..82c87876bdc8dba4a69de0c4872ffcfc015897ae 100644 (file)
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -30,40 +30,29 @@ class ImageMagickDecoder : public VideoDecoder
 public:
        ImageMagickDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const ImageMagickContent>);
 
-       float video_frame_rate () const {
-               return 24;
-       }
-
-       libdcp::Size native_size () const;
-       ContentVideoFrame video_length () const;
-
-       bool seek (double);
-       bool pass ();
+       /* Decoder */
 
-protected:
-       PixelFormat pixel_format () const;
+       void pass ();
+       void seek (Time);
+       void seek_back ();
+       void seek_forward ();
+       Time next () const;
+       bool done () const;
 
-       int time_base_numerator () const {
-               return 0;
-       }
+       /* VideoDecoder */
 
-       int time_base_denominator () const {
-               return 0;
-       }
+       float video_frame_rate () const;
+       libdcp::Size video_size () const;
+       ContentVideoFrame video_length () const;
 
-       int sample_aspect_ratio_numerator () const {
-               /* XXX */
-               return 1;
-       }
+       /* ImageMagickDecoder */
 
-       int sample_aspect_ratio_denominator () const {
-               /* XXX */
-               return 1;
+       boost::shared_ptr<const ImageMagickContent> content () const {
+               return _imagemagick_content;
        }
 
 private:
        boost::shared_ptr<const ImageMagickContent> _imagemagick_content;
        boost::shared_ptr<Image> _image;
-       ContentVideoFrame _position;
-       mutable boost::optional<libdcp::Size> _native_size;
+       mutable boost::optional<libdcp::Size> _video_size;
 };