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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 959ff7ac7..dca8eef11 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -37,6 +37,7 @@ class VideoContent;
 class ImageProxy;
 class Image;
 class Log;
+class FrameIntervalChecker;
 
 /** @class VideoDecoder
  *  @brief Parent for classes which decode video.
@@ -44,28 +45,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);
 
-	ContentTime position () const {
+	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);
 
-	void emit (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;
-	ContentTime _position;
+	/** 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;
+	boost::scoped_ptr<FrameIntervalChecker> _frame_interval_checker;
 };
 
 #endif