X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_decoder.h;h=a7849b9cc93a180110a4b7e902ecb08572369d2f;hb=bb917533ad5beaded24ed56c7c4dc71d50e76263;hp=6e89f6144da605a16071439b63879971e70d1918;hpb=83026b3b818b1acbd277663d40c4c9accf6eeee9;p=dcpomatic.git

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 6e89f6144..a7849b9cc 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -17,31 +17,36 @@
 
 */
 
-#ifndef DVDOMATIC_AUDIO_DECODER_H
-#define DVDOMATIC_AUDIO_DECODER_H
+/** @file src/lib/audio_decoder.h
+ *  @brief Parent class for audio decoders.
+ */
+
+#ifndef DCPOMATIC_AUDIO_DECODER_H
+#define DCPOMATIC_AUDIO_DECODER_H
 
-#include "audio_source.h"
-#include "stream.h"
 #include "decoder.h"
+#include "content.h"
+
+class AudioBuffers;
 
-class AudioDecoder : public AudioSource, public virtual Decoder
+/** @class AudioDecoder.
+ *  @brief Parent class for audio decoders.
+ */
+class AudioDecoder : public virtual Decoder
 {
 public:
-	AudioDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *);
+	AudioDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const AudioContent>);
 
-	virtual void set_audio_stream (boost::optional<AudioStream>);
+	/** Emitted when some audio data is ready */
+	boost::signals2::signal<void (boost::shared_ptr<const AudioBuffers>, AudioContent::Frame)> Audio;
 
-	boost::optional<AudioStream> audio_stream () const {
-		return _audio_stream;
-	}
+protected:
 
-	std::vector<AudioStream> audio_streams () const {
-		return _audio_streams;
-	}
+	void audio (boost::shared_ptr<const AudioBuffers>, AudioContent::Frame);
+	AudioContent::Frame _audio_position;
 
-protected:
-	boost::optional<AudioStream> _audio_stream;
-	std::vector<AudioStream> _audio_streams;
+private:
+	AudioContent::Frame _delay_frames;
 };
 
 #endif