X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_mxf_decoder.h;h=3e3760d97f7e75963e5df014b55ee79d7cbd4d38;hb=94ee305348f7d3eb548fd44ca4aa1c57645056b1;hp=fa9bfe818767d25c89e8f025affc40b9fa381d72;hpb=4ee6786d1c3db04dcc77e511121e5d62d0d595b5;p=dcpomatic.git

diff --git a/src/lib/video_mxf_decoder.h b/src/lib/video_mxf_decoder.h
index fa9bfe818..3e3760d97 100644
--- a/src/lib/video_mxf_decoder.h
+++ b/src/lib/video_mxf_decoder.h
@@ -1,23 +1,26 @@
 /*
     Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include "decoder.h"
+#include <dcp/mono_picture_asset_reader.h>
+#include <dcp/stereo_picture_asset_reader.h>
 
 class VideoMXFContent;
 class Log;
@@ -25,13 +28,18 @@ class Log;
 class VideoMXFDecoder : public Decoder
 {
 public:
-	VideoMXFDecoder (boost::shared_ptr<const VideoMXFContent>, boost::shared_ptr<Log> log);
+	VideoMXFDecoder (boost::shared_ptr<const Film> film, boost::shared_ptr<const VideoMXFContent>);
 
-private:
-	bool pass (PassReason, bool accurate);
+	bool pass ();
 	void seek (ContentTime t, bool accurate);
 
+private:
+
 	boost::shared_ptr<const VideoMXFContent> _content;
 	/** Time of next thing to return from pass */
 	ContentTime _next;
+
+	boost::shared_ptr<dcp::MonoPictureAssetReader> _mono_reader;
+	boost::shared_ptr<dcp::StereoPictureAssetReader> _stereo_reader;
+	dcp::Size _size;
 };