X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_decoder.h;h=ab6c4b8a931e12cfe892c8cb74d86ae7162d1a10;hb=77e4bcc1514fdeaa3838644f59439f34b064e33c;hp=1da8a676f37c7f59c3deeb46a166829e60ff1687;hpb=a0856e3fbef17f24073b01cb96be6bbcb229ecbc;p=dcpomatic.git

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 1da8a676f..ab6c4b8a9 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -24,33 +24,30 @@
 #ifndef DCPOMATIC_AUDIO_DECODER_H
 #define DCPOMATIC_AUDIO_DECODER_H
 
-#include "audio_source.h"
 #include "decoder.h"
-extern "C" {
-#include <libswresample/swresample.h>
-}
+#include "content.h"
+#include "audio_content.h"
 
-class AudioContent;
+class AudioBuffers;
 
 /** @class AudioDecoder.
  *  @brief Parent class for audio decoders.
  */
-class AudioDecoder : public AudioSource, public virtual Decoder
+class AudioDecoder : public virtual Decoder
 {
 public:
 	AudioDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const AudioContent>);
-	~AudioDecoder ();
 
-protected:
+	bool has_audio () const;
 
-	void audio (boost::shared_ptr<const AudioBuffers>, Time);
-	bool audio_done () const;
+	/** Emitted when some audio data is ready */
+	boost::signals2::signal<void (boost::shared_ptr<const AudioBuffers>, AudioContent::Frame)> Audio;
 
-	Time _next_audio;
-	boost::shared_ptr<const AudioContent> _audio_content;
+protected:
 
-private:	
-	SwrContext* _swr_context;
+	void audio (boost::shared_ptr<const AudioBuffers>, AudioContent::Frame);
+	boost::shared_ptr<const AudioContent> _audio_content;
+	AudioContent::Frame _audio_position;
 };
 
 #endif