diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-04-12 22:10:54 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 6f344b876689a1234a5eb75041882f06f5d9fe5c (patch) | |
| tree | 3a51f17cab8b8f31b21661b643aaed6a53326031 /src/lib/video_decoder.h | |
| parent | 36774ee2b48f0bfde43b743592e5816ff58bb7d2 (diff) | |
Reasonably straightforward stuff; main things are adding
a _parent to VideoContent (mainly, but not only, for signalling)
and moving the video shared_ptr into Content, which makes much
more sense to replace dynamic_cast tests for whether something
has video or whatever. Nearly builds.
Diffstat (limited to 'src/lib/video_decoder.h')
| -rw-r--r-- | src/lib/video_decoder.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h index af24b93bc..c787faa04 100644 --- a/src/lib/video_decoder.h +++ b/src/lib/video_decoder.h @@ -34,6 +34,7 @@ class VideoContent; class ImageProxy; class Image; +class Log; /** @class VideoDecoder * @brief Parent for classes which decode video. @@ -41,7 +42,7 @@ class Image; class VideoDecoder : public virtual Decoder { public: - VideoDecoder (boost::shared_ptr<const VideoContent> c); + VideoDecoder (boost::shared_ptr<const VideoContent> c, boost::shared_ptr<Log> log); std::list<ContentVideo> get_video (Frame frame, bool accurate); @@ -66,6 +67,7 @@ protected: void fill_both_eyes (Frame from, Frame to, Eyes); boost::shared_ptr<const VideoContent> _video_content; + boost::shared_ptr<Log> _log; std::list<ContentVideo> _decoded_video; boost::shared_ptr<Image> _black_image; boost::optional<ContentTime> _last_seek_time; |
