From de2af791bdfdcd653752cba970e59efc7bf810c7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 21 Nov 2016 16:57:15 +0000 Subject: Basic grunt-work, untested and unfinished, but it compiles. --- src/lib/audio_decoder.h | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'src/lib/audio_decoder.h') diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h index cdb643cee..a777592c2 100644 --- a/src/lib/audio_decoder.h +++ b/src/lib/audio_decoder.h @@ -30,6 +30,7 @@ #include "audio_stream.h" #include "decoder_part.h" #include +#include class AudioBuffers; class AudioContent; @@ -44,19 +45,12 @@ class AudioDecoder : public boost::enable_shared_from_this, public public: AudioDecoder (Decoder* parent, boost::shared_ptr, 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) - * @param length Frames to get (after resampling, if applicable) - * @param accurate true to try hard to return frames from exactly `frame', false if we don't mind nearby frames. - * @return Time-stamped audio data which may or may not be from the location (and of the length) requested. - */ - ContentAudio get (AudioStreamPtr stream, Frame time, Frame length, bool accurate); - void set_fast (); - - void give (AudioStreamPtr stream, boost::shared_ptr, ContentTime); void flush (); - void seek (ContentTime t, bool accurate); + + void emit (AudioStreamPtr stream, boost::shared_ptr, ContentTime); + + boost::signals2::signal Data; boost::optional position () const; -- cgit v1.2.3