X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=dca8eef11482b8a473b800670f270adfc6f42000;hb=fa5f3a8bf77209da27acc33cf144e2e4500a2600;hp=c2ba8386ebfa7475a8a7e9aec757e232da60bb6e;hpb=c4403784febdbdd42e9c32e67fadb147f11fe566;p=dcpomatic.git

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index c2ba8386e..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.
@@ -51,21 +52,22 @@ public:
 	friend struct ffmpeg_pts_offset_test;
 	friend void ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int gaps, int video_length);
 
-	dcpomatic::ContentTime position (boost::shared_ptr<const Film>) 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);
 
-	/** @return true if the emitted data was accepted, false if not */
 	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;
-	dcpomatic::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