X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fvideo_decoder.h;h=0fc7ca5a404832a34ba5daadcd567611a5eaa277;hb=c4e20995d4638c2d7575dcf12a917e27387078de;hp=c5e2ea4cf01a2cd63e4d3f23f421aa696db8c124;hpb=3c634dda1e88fe04b0f468f39bd13ea41a80989b;p=dcpomatic.git

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index c5e2ea4cf..0fc7ca5a4 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,25 +44,25 @@ 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<bool (ContentVideo)> Data;
+	boost::signals2::signal<void (ContentVideo)> Data;
 
 private:
+	/** Time of last thing to be emitted */
 	boost::shared_ptr<const Content> _content;
 	boost::optional<Frame> _last_emitted;
 	ContentTime _position;