X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_decoder.h;h=0cd0e9754c6c889fb77210b7109029ff50cfd1a7;hb=c226f90a2c113b8bbc270f29e6aa035ae1229d57;hp=cfe94b5283dc48c06a83e516b526c789dae46861;hpb=3f2365fcf3a1ffc50901eb2e4af246aa4c83e272;p=dcpomatic.git

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index cfe94b528..0cd0e9754 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -21,38 +21,33 @@
  *  @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"
+#include "audio_content.h"
+#include "decoded.h"
+
+class AudioBuffers;
 
 /** @class AudioDecoder.
  *  @brief Parent class for audio decoders.
  */
-class AudioDecoder : public TimedAudioSource, public virtual Decoder
+class AudioDecoder : public virtual Decoder
 {
 public:
-	AudioDecoder (boost::shared_ptr<Film>, DecodeOptions);
-
-	virtual void set_audio_stream (boost::shared_ptr<AudioStream>);
+	AudioDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const AudioContent>);
 
-	/** @return Audio stream that we are using */
-	boost::shared_ptr<AudioStream> audio_stream () const {
-		return _audio_stream;
-	}
-
-	/** @return All available audio streams */
-	std::vector<boost::shared_ptr<AudioStream> > audio_streams () const {
-		return _audio_streams;
+	boost::shared_ptr<const AudioContent> audio_content () const {
+		return _audio_content;
 	}
 
 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;
+
+	void audio (boost::shared_ptr<const AudioBuffers>, ContentTime);
+	
+	boost::shared_ptr<const AudioContent> _audio_content;	
 };
 
 #endif