diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-11-21 01:59:04 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-11-21 01:59:04 +0000 |
| commit | 254b3044d72de6b033d7c584f5abd2b9aa70aad5 (patch) | |
| tree | 8a5c83c1b2dea690672663dedb2f3aa50f4473dc /src/lib/video_decoder.h | |
| parent | c31b9542c58ae1cbfae7ec3ba4911359fd010ba2 (diff) | |
Take Film pointer out of Content.
Diffstat (limited to 'src/lib/video_decoder.h')
| -rw-r--r-- | src/lib/video_decoder.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h index 3fc30cf9d..0fc7ca5a4 100644 --- a/src/lib/video_decoder.h +++ b/src/lib/video_decoder.h @@ -44,20 +44,19 @@ class Log; class VideoDecoder : public DecoderPart { public: - VideoDecoder (Decoder* parent, boost::shared_ptr<const Content> c, boost::shared_ptr<Log> log); + VideoDecoder (Decoder* parent, boost::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); - ContentTime position () const { + ContentTime position (boost::shared_ptr<const Film>) const { return _position; } void seek (); - - void emit (boost::shared_ptr<const ImageProxy>, Frame frame); + void emit (boost::shared_ptr<const Film> film, boost::shared_ptr<const ImageProxy>, Frame frame); /** @return true if the emitted data was accepted, false if not */ boost::signals2::signal<void (ContentVideo)> Data; |
