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 f9948f5973eff4126416d1a506a9695a76f455cd..c393e95f12b776f3b93172a4539159c6b78fa8a2 100644 (file)
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -1,28 +1,41 @@
-#ifndef DVDOMATIC_AUDIO_DECODER_H
-#define DVDOMATIC_AUDIO_DECODER_H
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
 
-#include "audio_source.h"
-#include "stream.h"
-#include "decoder.h"
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
 
-class AudioDecoder : public AudioSource, public virtual Decoder
-{
-public:
-       AudioDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *);
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-       virtual void set_audio_stream (boost::optional<AudioStream>);
+*/
 
-       boost::optional<AudioStream> audio_stream () const {
-               return _audio_stream;
-       }
+/** @file src/lib/audio_decoder.h
+ *  @brief Parent class for audio decoders.
+ */
 
-       std::vector<AudioStream> audio_streams () const {
-               return _audio_streams;
-       }
+#ifndef DCPOMATIC_AUDIO_DECODER_H
+#define DCPOMATIC_AUDIO_DECODER_H
 
-protected:
-       boost::optional<AudioStream> _audio_stream;
-       std::vector<AudioStream> _audio_streams;
+#include "audio_source.h"
+#include "decoder.h"
+
+class AudioContent;
+
+/** @class AudioDecoder.
+ *  @brief Parent class for audio decoders.
+ */
+class AudioDecoder : public TimedAudioSource, public virtual Decoder
+{
+public:
+       AudioDecoder (boost::shared_ptr<const Film>);
 };
 
 #endif