X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=76a91c5255bac1c26c4aa5d25ad3f6daa61f2ddb;hb=1bfc60e40f533c6d931a915deabd97899719eb4b;hp=e9bef24f81d61cd184ddfd3e81e83eeb282b796a;hpb=e11276a822289d7d7d91a4f431f386ad28ef16dd;p=dcpomatic.git

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index e9bef24f8..76a91c525 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,29 +44,29 @@ 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 set_position (ContentTime position) {
-		_position = position;
-	}
-
-	boost::optional<ContentTime> position () const {
+	dcpomatic::ContentTime position (boost::shared_ptr<const Film>) const {
 		return _position;
 	}
 
-	void emit (boost::shared_ptr<const ImageProxy>, Frame frame);
+	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;
-	boost::optional<ContentTime> _position;
+	/** Frame of last thing to be emitted */
+	boost::optional<Frame> _last_emitted_frame;
+	boost::optional<Eyes> _last_emitted_eyes;
+	dcpomatic::ContentTime _position;
 };
 
 #endif