X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fimage_decoder.h;h=41924735c4635c07d0ad0e484954091c9f248dfa;hb=c5b966261b7b268f495d7a72b7af4d4e6a75e618;hp=9b8cf73bbba6461a5da786d312338b35c25144de;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h
index 9b8cf73bb..41924735c 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,26 +18,31 @@
 
 */
 
+
 #include "decoder.h"
+#include "types.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 _video_position;
+	std::shared_ptr<const ImageContent> _image_content;
+	std::shared_ptr<ImageProxy> _image;
+	Frame _frame_video_position = 0;
 };