std::shared_ptr

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 0fc7ca5a404832a34ba5daadcd567611a5eaa277..5d9a6b8a051a62059f9717771c4585d4eb5aae86 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -31,12 +31,12 @@
 #include "content_video.h"
 #include "decoder_part.h"
 #include <boost/signals2.hpp>
-#include <boost/shared_ptr.hpp>
 
 class VideoContent;
 class ImageProxy;
 class Image;
 class Log;
+class FrameIntervalChecker;
 
 /** @class VideoDecoder
  *  @brief Parent for classes which decode video.
@@ -44,28 +44,29 @@ class Log;
 class VideoDecoder : public DecoderPart
 {
 public:
-       VideoDecoder (Decoder* parent, boost::shared_ptr<const Content> c);
+       VideoDecoder (Decoder* parent, std::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 (boost::shared_ptr<const Film>) const {
+       boost::optional<dcpomatic::ContentTime> position (std::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 (std::shared_ptr<const Film> film, std::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;
-       ContentTime _position;
+       std::shared_ptr<const Content> _content;
+       /** 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