summaryrefslogtreecommitdiff
path: root/src/lib/imagemagick_decoder.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/imagemagick_decoder.h')
-rw-r--r--src/lib/imagemagick_decoder.h21
1 files changed, 10 insertions, 11 deletions
diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index ba54c0efa..74f01d6bb 100644
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -30,27 +30,26 @@ class ImageMagickDecoder : public VideoDecoder
public:
ImageMagickDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const ImageMagickContent>);
- bool pass ();
- bool seek (double);
+ /* Decoder */
+
+ void pass ();
+ void seek (double);
Time next () const;
- float video_frame_rate () const {
- return 24;
- }
+ /* VideoDecoder */
- libdcp::Size native_size () const;
+ float video_frame_rate () const;
+ libdcp::Size video_size () const;
ContentVideoFrame video_length () const;
+ /* ImageMagickDecoder */
+
boost::shared_ptr<const ImageMagickContent> content () const {
return _imagemagick_content;
}
-protected:
- PixelFormat pixel_format () const;
-
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;
};