X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_decoder.h;h=fbb1ad4d45f8d9a0988c3706dcd46564df45a6ec;hp=f8438df524cdbdfabb4bcfe6ddc91145db5f60aa;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hpb=c6c082c4a8016f85ba4207f4b8ccee1d5770e4a4

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index f8438df52..fbb1ad4d4 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012-2014 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,24 +26,22 @@
 #define DCPOMATIC_AUDIO_DECODER_H
 
 #include "decoder.h"
-#include "content.h"
-#include "audio_content.h"
 #include "content_audio.h"
+#include "audio_stream.h"
+#include <boost/enable_shared_from_this.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:
-	AudioDecoder (boost::shared_ptr<const AudioContent>);
-	
-	boost::shared_ptr<const AudioContent> audio_content () const {
-		return _audio_content;
-	}
+	AudioDecoder (Decoder* parent, boost::shared_ptr<const AudioContent>, bool fast, boost::shared_ptr<Log> log);
 
 	/** Try to fetch some audio from a specific place in this content.
 	 *  @param frame Frame to start from (after resampling, if applicable)
@@ -50,26 +49,23 @@ public:
 	 *  @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:
+	ContentAudio get (AudioStreamPtr stream, Frame time, Frame length, bool accurate);
+
+	void set_ignore ();
 
-	void seek (ContentTime time, bool accurate);
-	void audio (boost::shared_ptr<const AudioBuffers>, ContentTime);
+	bool fast () const {
+		return _fast;
+	}
+
+	void give (AudioStreamPtr stream, boost::shared_ptr<const AudioBuffers>, ContentTime);
 	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;
+	void seek (ContentTime t, bool accurate);
+
+private:
+	/** An AudioDecoderStream object to manage each stream in _audio_content */
+	std::map<AudioStreamPtr, boost::shared_ptr<AudioDecoderStream> > _streams;
+	bool _ignore;
+	bool _fast;
 };
 
 #endif