Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x

[dcpomatic.git] / src / lib / video_decoder.h

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 34ce8f288b009d1669141b9c0314543e5064e2a6..dca8eef11482b8a473b800670f270adfc6f42000 100644 (file)
--- 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.
@@ -58,15 +59,15 @@ public:
        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;
-       /** Frame of last thing to be emitted */
+       /** 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