X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=ed56feea05284ccc785e74ba1167b2049cf6322f;hp=959ff7ac70c54ad7be8cf1f856812ee88d8a6bdf;hb=f0c10e92b849566e458bc323f8783a6fe83e52d2;hpb=efa79a3db4a041cda3d93dde444e5dca9b84b976

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 959ff7ac7..ed56feea0 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -44,27 +44,28 @@ 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);
 
-	ContentTime position () const {
+	ContentTime position (boost::shared_ptr<const Film>) const {
 		return _position;
 	}
 
 	void seek ();
-
-	void emit (boost::shared_ptr<const ImageProxy>, Frame frame);
+	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 */
+	boost::optional<Frame> _last_emitted_frame;
+	boost::optional<Eyes> _last_emitted_eyes;
 	ContentTime _position;
 };