X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=62757e3a9356b2e71681aea6ded0afa1aad2b60b;hb=0a3f387f5d39da2ca38ec90a9593c1b598040dd7;hp=08173d34d3fd9655a2c69faa07cbc15613ba2c08;hpb=de2af791bdfdcd653752cba970e59efc7bf810c7;p=dcpomatic.git

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 08173d34d..62757e3a9 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -44,20 +44,30 @@ class Log;
 class VideoDecoder : public DecoderPart
 {
 public:
-	VideoDecoder (Decoder* parent, boost::shared_ptr<const Content> c, boost::shared_ptr<Log> log);
+	VideoDecoder (Decoder* parent, boost::shared_ptr<const Content> c);
 
 	friend struct video_decoder_fill_test1;
 	friend struct video_decoder_fill_test2;
 	friend struct ffmpeg_pts_offset_test;
 	friend void ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int gaps, int video_length);
 
-	void emit (boost::shared_ptr<const ImageProxy>, Frame frame);
+	boost::optional<dcpomatic::ContentTime> position (boost::shared_ptr<const Film>) const {
+		return _position;
+	}
 
+	void seek ();
+	void emit (boost::shared_ptr<const Film> film, boost::shared_ptr<const ImageProxy>, Frame frame);
+
+	/** @return true if the emitted data was accepted, false if not */
 	boost::signals2::signal<void (ContentVideo)> Data;
 
 private:
 	boost::shared_ptr<const Content> _content;
-	boost::optional<Frame> _last_emitted;
+	/** Frame of last thing to be emitted; only used for 3D */
+	boost::optional<Frame> _last_emitted_frame;
+	boost::optional<Eyes> _last_emitted_eyes;
+	boost::optional<dcpomatic::ContentTime> _position;
+	std::vector<Frame> _last_threed_frames;
 };
 
 #endif