From 254b3044d72de6b033d7c584f5abd2b9aa70aad5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 21 Nov 2018 01:59:04 +0000 Subject: Take Film pointer out of Content. --- src/lib/video_decoder.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/lib/video_decoder.h') 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 c, boost::shared_ptr log); + VideoDecoder (Decoder* parent, boost::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); - ContentTime position () const { + ContentTime position (boost::shared_ptr) const { return _position; } void seek (); - - void emit (boost::shared_ptr, Frame frame); + void emit (boost::shared_ptr film, boost::shared_ptr, Frame frame); /** @return true if the emitted data was accepted, false if not */ boost::signals2::signal Data; -- cgit v1.2.3