C++11 tidying.

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

diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h
index d023636bfe433138db3be83162936a0cd2a1b41d..067a247208f31b05f7c7cc4f1f6722b1deed09ba 100644 (file)
--- a/src/lib/image_decoder.h
+++ b/src/lib/image_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     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<const ImageContent> c, boost::shared_ptr<Log> log);
+       ImageDecoder (std::shared_ptr<const Film> film, std::shared_ptr<const ImageContent> c);
 
-       boost::shared_ptr<const ImageContent> content () {
+       std::shared_ptr<const ImageContent> 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<const ImageContent> _image_content;
-       boost::shared_ptr<ImageProxy> _image;
-       Frame _frame_video_position;
+       std::shared_ptr<const ImageContent> _image_content;
+       std::shared_ptr<ImageProxy> _image;
+       Frame _frame_video_position = 0;
 };