X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=5d9a6b8a051a62059f9717771c4585d4eb5aae86;hb=40457440bc4fcadf13ba7acf5fb198cdba23c13a;hp=dca8eef11482b8a473b800670f270adfc6f42000;hpb=1679c3dc40262733f46dda9f4151367bf93f2b76;p=dcpomatic.git 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 -#include class VideoContent; class ImageProxy; @@ -45,24 +44,24 @@ class FrameIntervalChecker; class VideoDecoder : public DecoderPart { public: - VideoDecoder (Decoder* parent, boost::shared_ptr c); + VideoDecoder (Decoder* parent, std::shared_ptr 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 position (boost::shared_ptr) const { + boost::optional position (std::shared_ptr) const { return _position; } void seek (); - void emit (boost::shared_ptr film, boost::shared_ptr, Frame frame); + void emit (std::shared_ptr film, std::shared_ptr, Frame frame); boost::signals2::signal Data; private: - boost::shared_ptr _content; + std::shared_ptr _content; /** Frame of last thing to be emitted; only used for 3D */ boost::optional _last_emitted_frame; boost::optional _last_emitted_eyes;