Rename TYPE_DEBUG_PLAYER to TYPE_DEBUG_VIDEO_VIEW.

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index c5e2ea4cf01a2cd63e4d3f23f421aa696db8c124..dca8eef11482b8a473b800670f270adfc6f42000 100644 (file)
--- 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.
 
@@ -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<bool (ContentVideo)> Data;
+       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