X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_decoder.h;h=35d9f3560b7d55565ddc3eb8cf9b17e1bebe4ac7;hb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;hp=ab6c4b8a931e12cfe892c8cb74d86ae7162d1a10;hpb=0e2c7f060529d93035e89b06d4aa687830a5e0ad;p=dcpomatic.git

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index ab6c4b8a9..50e361e8f 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-2018 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,29 +26,50 @@
 #define DCPOMATIC_AUDIO_DECODER_H
 
 #include "decoder.h"
-#include "content.h"
-#include "audio_content.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 AudioContent;
+class AudioDecoderStream;
+class Log;
+class Film;
+class Resampler;
 
 /** @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>);
+	AudioDecoder (Decoder* parent, boost::shared_ptr<const AudioContent> content, bool fast);
+
+	ContentTime position (boost::shared_ptr<const Film> film) const;
+	void emit (boost::shared_ptr<const Film> film, AudioStreamPtr stream, boost::shared_ptr<const AudioBuffers>, ContentTime);
+	void seek ();
+	void flush ();
+
+	ContentTime stream_position (boost::shared_ptr<const Film> film, AudioStreamPtr stream) const;
 
-	bool has_audio () const;
+	/** @return Number of frames of data that were accepted */
+	boost::signals2::signal<void (AudioStreamPtr, ContentAudio)> Data;
 
-	/** Emitted when some audio data is ready */
-	boost::signals2::signal<void (boost::shared_ptr<const AudioBuffers>, AudioContent::Frame)> Audio;
+private:
+	void silence (int milliseconds);
 
-protected:
+	boost::shared_ptr<const AudioContent> _content;
+	/** Frame after the last one that was emitted from Data (i.e. at the resampled rate, if applicable)
+	 *  for each AudioStream.
+	 */
+	typedef std::map<AudioStreamPtr, Frame> PositionMap;
+	PositionMap _positions;
+	typedef std::map<AudioStreamPtr, boost::shared_ptr<Resampler> > ResamplerMap;
+	ResamplerMap _resamplers;
 
-	void audio (boost::shared_ptr<const AudioBuffers>, AudioContent::Frame);
-	boost::shared_ptr<const AudioContent> _audio_content;
-	AudioContent::Frame _audio_position;
+	bool _fast;
 };
 
 #endif