X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_decoder.h;h=754321880bcb026c7af361f6ff642eea350ea3f0;hp=750ecd360aa67b705e5b54d730a222ef8fe15455;hb=da44da6f31f97d39ca91c35955e573e76371f2c2;hpb=04eebe07e2f64bd15f6887a10ab51fb92c52901a

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 750ecd360..754321880 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -1,75 +1,79 @@
 /*
-    Copyright (C) 2012-2014 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/>.
 
 */
 
+
 /** @file src/lib/audio_decoder.h
  *  @brief Parent class for audio decoders.
  */
 
+
 #ifndef DCPOMATIC_AUDIO_DECODER_H
 #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/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 std::enable_shared_from_this<AudioDecoder>, public DecoderPart
 {
 public:
-	AudioDecoder (boost::shared_ptr<const AudioContent>);
-	
-	boost::shared_ptr<const AudioContent> audio_content () const {
-		return _audio_content;
-	}
-
-	/** Try to fetch some audio from a specific place in this content.
-	 *  @param frame Frame to start from.
-	 *  @param length Frames to get.
-	 *  @param accurate true to try hard to return frames from exactly `frame', false if we don't mind nearby frames.
-	 *  @return Time-stamped audio data which may or may not be from the location (and of the length) requested.
-	 */
-	boost::shared_ptr<ContentAudio> get_audio (AudioFrame time, AudioFrame length, bool accurate);
-	
-protected:
+	AudioDecoder (Decoder* parent, std::shared_ptr<const AudioContent> content, bool fast);
 
-	void seek (ContentTime time, bool accurate);
-	void audio (boost::shared_ptr<const AudioBuffers>, ContentTime);
+	boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film> film) const;
+	void emit (std::shared_ptr<const Film> film, AudioStreamPtr stream, std::shared_ptr<const AudioBuffers>, dcpomatic::ContentTime, bool time_already_delayed = false);
+	void seek ();
 	void flush ();
-	void reset_decoded_audio ();
-	void add (boost::shared_ptr<const AudioBuffers>);
-
-	boost::shared_ptr<const AudioContent> _audio_content;
-	boost::shared_ptr<Resampler> _resampler;
-	boost::shared_ptr<AudioProcessor> _processor;
-	boost::optional<AudioFrame> _audio_position;
-	/** Currently-available decoded audio data */
-	ContentAudio _decoded_audio;
-	/** The time of an accurate seek after which we have not yet received any actual
-	    data at the seek time.
-	*/
-	boost::optional<ContentTime> _seek_reference;
+
+	dcpomatic::ContentTime stream_position (std::shared_ptr<const Film> film, AudioStreamPtr stream) const;
+
+	boost::signals2::signal<void (AudioStreamPtr, ContentAudio)> Data;
+
+private:
+	void silence (int milliseconds);
+
+	std::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, std::shared_ptr<Resampler>> ResamplerMap;
+	ResamplerMap _resamplers;
+
+	bool _fast;
 };
 
+
 #endif