summaryrefslogtreecommitdiff
path: root/src/lib/video_decoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-01-04 21:16:53 +0100
committerCarl Hetherington <cth@carlh.net>2021-01-07 22:48:29 +0100
commitdd9be86db6cde0afa5da0d1d1ac43b42e05dca26 (patch)
treee56a3f82fb9e1c8602f265bea0d0688d8a018644 /src/lib/video_decoder.h
parent0d35820cf50d2789752b8776683b26d04642518d (diff)
std::shared_ptr
Diffstat (limited to 'src/lib/video_decoder.h')
-rw-r--r--src/lib/video_decoder.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index dca8eef11..5d9a6b8a0 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -31,7 +31,6 @@
#include "content_video.h"
#include "decoder_part.h"
#include <boost/signals2.hpp>
-#include <boost/shared_ptr.hpp>
class VideoContent;
class ImageProxy;
@@ -45,24 +44,24 @@ class FrameIntervalChecker;
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;