X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_decoder.h;h=067a247208f31b05f7c7cc4f1f6722b1deed09ba;hb=d5e6fa029f1fb7b7dccd32dd2906a0858a876cae;hp=9b8cf73bbba6461a5da786d312338b35c25144de;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h index 9b8cf73bb..067a24720 100644 --- a/src/lib/image_decoder.h +++ b/src/lib/image_decoder.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,26 +18,30 @@ */ + #include "decoder.h" + class ImageContent; class Log; class ImageProxy; + class ImageDecoder : public Decoder { public: - ImageDecoder (boost::shared_ptr c, boost::shared_ptr log); + ImageDecoder (std::shared_ptr film, std::shared_ptr c); - boost::shared_ptr content () { + std::shared_ptr content () { return _image_content; } + bool pass () override; + void seek (dcpomatic::ContentTime, bool) override; + private: - bool pass (Decoder::PassReason, bool); - void seek (ContentTime, bool); - boost::shared_ptr _image_content; - boost::shared_ptr _image; - Frame _video_position; + std::shared_ptr _image_content; + std::shared_ptr _image; + Frame _frame_video_position = 0; };