X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_decoder.h;h=bb3aafccd6a8982824f890fa05907ea8def66b96;hb=3350e8134ec419ca561d3e596c510fbfe0e071d5;hp=a295df0ccbbf9d770b7f60afb0926ec99c56f659;hpb=d2926ea8574330b9c7f4efa4241843cf052652b8;p=dcpomatic.git

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index a295df0cc..25d858681 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic 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.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic 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.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -25,34 +26,33 @@
 #define DCPOMATIC_AUDIO_DECODER_H
 
 #include "decoder.h"
-#include "content.h"
-#include "audio_content.h"
-#include "decoded.h"
+#include "content_audio.h"
+#include "audio_stream.h"
+#include "decoder_part.h"
+#include <boost/enable_shared_from_this.hpp>
+#include <boost/signals2.hpp>
 
 class AudioBuffers;
-class Resampler;
+class AudioContent;
+class AudioDecoderStream;
+class Log;
 
 /** @class AudioDecoder.
  *  @brief Parent class for audio decoders.
  */
-class AudioDecoder : public virtual Decoder
+class AudioDecoder : public boost::enable_shared_from_this<AudioDecoder>, public DecoderPart
 {
 public:
-	AudioDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const AudioContent>);
-	
-	boost::shared_ptr<const AudioContent> audio_content () const {
-		return _audio_content;
-	}
+	AudioDecoder (Decoder* parent, boost::shared_ptr<const AudioContent> content, boost::shared_ptr<Log> log);
 
-protected:
+	ContentTime position () const;
+	void emit (AudioStreamPtr stream, boost::shared_ptr<const AudioBuffers>, ContentTime);
+	void seek ();
 
-	void audio (boost::shared_ptr<const AudioBuffers>, ContentTime);
-	void flush ();
+	boost::signals2::signal<void (AudioStreamPtr, ContentAudio)> Data;
 
-	boost::shared_ptr<const AudioContent> _audio_content;
-	boost::shared_ptr<Resampler> _resampler;
-	/* End time of last audio that we wrote to _pending; only used for flushing the resampler */
-	ContentTime _last_audio;
+private:
+	std::map<AudioStreamPtr, Frame> _positions;
 };
 
 #endif