Untested merge of master.

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

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index e9fbd6f62f19f1605f1e77ec3685f98601d71a0c..c393e95f12b776f3b93172a4539159c6b78fa8a2 100644 (file)
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -17,31 +17,25 @@
 
 */
 
-#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"
 
-class AudioDecoder : public AudioSource, public virtual Decoder
+class AudioContent;
+
+/** @class AudioDecoder.
+ *  @brief Parent class for audio decoders.
+ */
+class AudioDecoder : public TimedAudioSource, public virtual Decoder
 {
 public:
-       AudioDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *);
-
-       virtual void set_audio_stream (boost::shared_ptr<AudioStream>);
-
-       boost::shared_ptr<AudioStream> audio_stream () const {
-               return _audio_stream;
-       }
-
-       std::vector<boost::shared_ptr<AudioStream> > audio_streams () const {
-               return _audio_streams;
-       }
-
-protected:
-       boost::shared_ptr<AudioStream> _audio_stream;
-       std::vector<boost::shared_ptr<AudioStream> > _audio_streams;
+       AudioDecoder (boost::shared_ptr<const Film>);
 };
 
 #endif