From 504c63b3d62038bc486ca8a09e77fbb403907edd Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 10 May 2016 14:29:14 +0100 Subject: Basics of splitting up Decoder tree like Content. --- src/lib/audio_decoder.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/lib/audio_decoder.h') diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h index 31d0785c6..a56847daf 100644 --- a/src/lib/audio_decoder.h +++ b/src/lib/audio_decoder.h @@ -37,10 +37,10 @@ class Log; /** @class AudioDecoder. * @brief Parent class for audio decoders. */ -class AudioDecoder : public virtual Decoder, public boost::enable_shared_from_this +class AudioDecoder : public boost::enable_shared_from_this { public: - AudioDecoder (boost::shared_ptr, bool fast, boost::shared_ptr log); + AudioDecoder (Decoder* parent, boost::shared_ptr, bool fast, boost::shared_ptr log); /** Try to fetch some audio from a specific place in this content. * @param frame Frame to start from (after resampling, if applicable) @@ -56,7 +56,6 @@ public: return _fast; } -protected: void audio (AudioStreamPtr stream, boost::shared_ptr, ContentTime); void flush (); void seek (ContentTime t, bool accurate); -- cgit v1.2.3