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

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 9bef8e0e7..a7849b9cc 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -21,38 +21,32 @@
  *  @brief Parent class for audio decoders.
  */
 
-#ifndef DVDOMATIC_AUDIO_DECODER_H
-#define DVDOMATIC_AUDIO_DECODER_H
+#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.
  *  @brief Parent class for audio decoders.
  */
-class AudioDecoder : public AudioSource, public virtual Decoder
+class AudioDecoder : public virtual Decoder
 {
 public:
-	AudioDecoder (boost::shared_ptr<Film>, DecodeOptions);
+	AudioDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const AudioContent>);
 
-	virtual void set_audio_stream (boost::shared_ptr<AudioStream>);
+	/** Emitted when some audio data is ready */
+	boost::signals2::signal<void (boost::shared_ptr<const AudioBuffers>, AudioContent::Frame)> Audio;
 
-	/** @return Audio stream that we are using */
-	boost::shared_ptr<AudioStream> audio_stream () const {
-		return _audio_stream;
-	}
+protected:
 
-	/** @return All available audio streams */
-	std::vector<boost::shared_ptr<AudioStream> > audio_streams () const {
-		return _audio_streams;
-	}
+	void audio (boost::shared_ptr<const AudioBuffers>, AudioContent::Frame);
+	AudioContent::Frame _audio_position;
 
-protected:
-	/** Audio stream that we are using */
-	boost::shared_ptr<AudioStream> _audio_stream;
-	/** All available audio streams */
-	std::vector<boost::shared_ptr<AudioStream> > _audio_streams;
+private:
+	AudioContent::Frame _delay_frames;
 };
 
 #endif