X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=5d9a6b8a051a62059f9717771c4585d4eb5aae86;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=c8530d82caa850429536e0bd0859396f198c7e4c;hpb=588a3899fd6069f18b6e9f3d5ec62f2e938e034d;p=dcpomatic.git

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index c8530d82c..5d9a6b8a0 100644
--- 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,29 +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);
 
-	boost::optional<dcpomatic::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);
 
 	boost::signals2::signal<void (ContentVideo)> Data;
 
 private:
-	boost::shared_ptr<const Content> _content;
+	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;
-	std::vector<Frame> _last_threed_frames;
+	boost::scoped_ptr<FrameIntervalChecker> _frame_interval_checker;
 };
 
 #endif