X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_decoder.h;h=067a247208f31b05f7c7cc4f1f6722b1deed09ba;hb=e14c78e13eab9125a875e90b97c7dab77aa46b90;hp=140032317f9fb331147c31ede4e4a998f73607e2;hpb=eb135e8dcdf36ae82420bcd18e954ad593b3e9a5;p=dcpomatic.git

diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h
index 140032317..067a24720 100644
--- 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,27 +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 ();
-	void seek (ContentTime, bool);
+	bool pass () override;
+	void seek (dcpomatic::ContentTime, bool) override;
 
 private:
 
-	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;
 };