X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fimagemagick_decoder.h;h=80a08f81f8374a3126a425ee413d0c0eedf21e29;hb=254664b5a482cb3551d0a98ececfbdd8296e6c71;hp=c4795b003732dd3c500d5e326df6de7fbecca131;hpb=d1b20374b1bd02b2929c9c3080c006874b525ef5;p=dcpomatic.git diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h index c4795b003..80a08f81f 100644 --- a/src/lib/imagemagick_decoder.h +++ b/src/lib/imagemagick_decoder.h @@ -26,12 +26,9 @@ namespace Magick { class ImageMagickDecoder : public VideoDecoder { public: - ImageMagickDecoder (boost::shared_ptr, boost::shared_ptr, Job *); + ImageMagickDecoder (boost::shared_ptr, DecodeOptions); - float frames_per_second () const { - /* We don't know */ - return 0; - } + float frames_per_second () const; libdcp::Size native_size () const; @@ -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 _files; std::list::iterator _iter; + + boost::shared_ptr _image; };