From 9c399a21b37d83ceb2c81706975e2c46d1a3f673 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 18 Dec 2013 09:39:36 +0000 Subject: Considerable rework of decoder timing; tests pass, at least. --- src/lib/audio_decoder.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/lib/audio_decoder.h') diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h index 10e4298f7..0cd0e9754 100644 --- a/src/lib/audio_decoder.h +++ b/src/lib/audio_decoder.h @@ -27,6 +27,7 @@ #include "decoder.h" #include "content.h" #include "audio_content.h" +#include "decoded.h" class AudioBuffers; @@ -38,15 +39,15 @@ class AudioDecoder : public virtual Decoder public: AudioDecoder (boost::shared_ptr, boost::shared_ptr); - bool has_audio () const; - - /** Emitted when some audio data is ready */ - boost::signals2::signal, ContentTime)> Audio; + boost::shared_ptr audio_content () const { + return _audio_content; + } protected: void audio (boost::shared_ptr, ContentTime); - boost::shared_ptr _audio_content; + + boost::shared_ptr _audio_content; }; #endif -- cgit v1.2.3