X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=9d69f743a33d6c08d3efae5af36329a4278cb709;hp=dca8eef11482b8a473b800670f270adfc6f42000;hb=ac34066d5e448d1984d11a180be74e31b6e13b5c;hpb=1679c3dc40262733f46dda9f4151367bf93f2b76

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index dca8eef11..9d69f743a 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,20 +18,23 @@
 
 */
 
+
 /** @file  src/lib/video_decoder.h
  *  @brief VideoDecoder class.
  */
 
+
 #ifndef DCPOMATIC_VIDEO_DECODER_H
 #define DCPOMATIC_VIDEO_DECODER_H
 
+
 #include "decoder.h"
 #include "video_content.h"
 #include "util.h"
 #include "content_video.h"
 #include "decoder_part.h"
 #include <boost/signals2.hpp>
-#include <boost/shared_ptr.hpp>
+
 
 class VideoContent;
 class ImageProxy;
@@ -39,35 +42,36 @@ class Image;
 class Log;
 class FrameIntervalChecker;
 
+
 /** @class VideoDecoder
  *  @brief Parent for classes which decode video.
  */
 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;
-	/** Frame of last thing to be emitted; only used for 3D */
-	boost::optional<Frame> _last_emitted_frame;
+	std::shared_ptr<const Content> _content;
+	/** Eyes of last thing to be emitted; only used for THREE_D_ALTERNATE */
 	boost::optional<Eyes> _last_emitted_eyes;
 	boost::optional<dcpomatic::ContentTime> _position;
 	boost::scoped_ptr<FrameIntervalChecker> _frame_interval_checker;
 };
 
+
 #endif