Basics of front-end 3D (as far as viewer, at least).

[dcpomatic.git] / src / lib / audio_decoder.h

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 6e89f6144da605a16071439b63879971e70d1918..2ad53da8bf42684e544e753bc6b0ca4708c72d19 100644 (file)
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -17,31 +17,34 @@
 
 */
 
-#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"
+#include "audio_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 *);
-
-       virtual void set_audio_stream (boost::optional<AudioStream>);
+       AudioDecoder (boost::shared_ptr<const Film>);
 
-       boost::optional<AudioStream> audio_stream () const {
-               return _audio_stream;
-       }
-
-       std::vector<AudioStream> audio_streams () const {
-               return _audio_streams;
-       }
+       /** Emitted when some audio data is ready */
+       boost::signals2::signal<void (boost::shared_ptr<const AudioBuffers>, AudioContent::Frame)> Audio;
 
 protected:
-       boost::optional<AudioStream> _audio_stream;
-       std::vector<AudioStream> _audio_streams;
+
+       void audio (boost::shared_ptr<const AudioBuffers>, AudioContent::Frame);
+       AudioContent::Frame _audio_position;
 };
 
 #endif