X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=42cfc49063de396fa5043f193430ccffc6279eb0;hb=bdbe925a467f9b7149322ad8d1c090d4c1e6d5c3;hp=f37d4b1ad8458f7b26176676e4c788a054e2d78d;hpb=cf8e0e9e26dbaefab768000ebc1655b34ad11105;p=dcpomatic.git

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index f37d4b1ad..42cfc4906 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -43,12 +43,14 @@ class VideoDecoder : public virtual Decoder
 public:
 	VideoDecoder (boost::shared_ptr<const VideoContent> c);
 
-	std::list<ContentVideo> get_video (VideoFrame frame, bool accurate);
+	std::list<ContentVideo> get_video (Frame frame, bool accurate);
 
 	boost::shared_ptr<const VideoContent> video_content () const {
 		return _video_content;
 	}
 
+	void set_ignore_video ();
+
 #ifdef DCPOMATIC_DEBUG
 	int test_gaps;
 #endif
@@ -58,17 +60,19 @@ protected:
 	friend struct video_decoder_fill_test2;
 
 	void seek (ContentTime time, bool accurate);
-	void video (boost::shared_ptr<const ImageProxy>, VideoFrame frame);
-	std::list<ContentVideo> decoded_video (VideoFrame frame);
-	void fill_2d (VideoFrame from, VideoFrame to);
-	void fill_3d (VideoFrame from, VideoFrame to, Eyes);
+	void video (boost::shared_ptr<const ImageProxy>, Frame frame);
+	std::list<ContentVideo> decoded_video (Frame frame);
+	void fill_one_eye (Frame from, Frame to, Eyes);
+	void fill_both_eyes (Frame from, Frame to, Eyes);
 
 	boost::shared_ptr<const VideoContent> _video_content;
 	std::list<ContentVideo> _decoded_video;
-	bool _same;
 	boost::shared_ptr<Image> _black_image;
 	boost::optional<ContentTime> _last_seek_time;
 	bool _last_seek_accurate;
+
+	/** true if this decoder should ignore all video; i.e. never produce any */
+	bool _ignore_video;
 };
 
 #endif