X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fvideo_mxf_decoder.h;h=774e269c6d5da15275e1ccf61259f4ad1f510fa3;hb=da44da6f31f97d39ca91c35955e573e76371f2c2;hp=0432ad885e0ad9554bfd3082b94979a32050836c;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/video_mxf_decoder.h b/src/lib/video_mxf_decoder.h
index 0432ad885..774e269c6 100644
--- a/src/lib/video_mxf_decoder.h
+++ b/src/lib/video_mxf_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,21 +18,31 @@
 
 */
 
+
 #include "decoder.h"
+#include <dcp/mono_picture_asset_reader.h>
+#include <dcp/stereo_picture_asset_reader.h>
+
 
 class VideoMXFContent;
 class Log;
 
+
 class VideoMXFDecoder : public Decoder
 {
 public:
-	VideoMXFDecoder (boost::shared_ptr<const VideoMXFContent>, boost::shared_ptr<Log> log);
+	VideoMXFDecoder (std::shared_ptr<const Film> film, std::shared_ptr<const VideoMXFContent>);
+
+	bool pass () override;
+	void seek (dcpomatic::ContentTime t, bool accurate) override;
 
 private:
-	bool pass (PassReason, bool accurate);
-	void seek (ContentTime t, bool accurate);
 
-	boost::shared_ptr<const VideoMXFContent> _content;
+	std::shared_ptr<const VideoMXFContent> _content;
 	/** Time of next thing to return from pass */
-	ContentTime _next;
+	dcpomatic::ContentTime _next;
+
+	std::shared_ptr<dcp::MonoPictureAssetReader> _mono_reader;
+	std::shared_ptr<dcp::StereoPictureAssetReader> _stereo_reader;
+	dcp::Size _size;
 };