X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_decoder.h;h=387b1ad7ff74e396a6e85978ec6731a8c3af60d9;hb=ed1a6b0bf1a2c781a22640fd8a0c44a79f063bae;hp=10e4298f76a35873c403bc16b42fd8295ec7f801;hpb=da19eaac0dd80afed3dd282d61ea3298196a5090;p=dcpomatic.git

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 10e4298f7..387b1ad7f 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     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
@@ -27,26 +27,41 @@
 #include "decoder.h"
 #include "content.h"
 #include "audio_content.h"
+#include "content_audio.h"
+#include <boost/enable_shared_from_this.hpp>
 
 class AudioBuffers;
+class AudioDecoderStream;
 
 /** @class AudioDecoder.
  *  @brief Parent class for audio decoders.
  */
-class AudioDecoder : public virtual Decoder
+class AudioDecoder : public virtual Decoder, public boost::enable_shared_from_this<AudioDecoder>
 {
 public:
-	AudioDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const AudioContent>);
+	AudioDecoder (boost::shared_ptr<const AudioContent>);
 
-	bool has_audio () const;
+	boost::shared_ptr<const AudioContent> audio_content () const {
+		return _audio_content;
+	}
 
-	/** Emitted when some audio data is ready */
-	boost::signals2::signal<void (boost::shared_ptr<const AudioBuffers>, ContentTime)> Audio;
+	/** Try to fetch some audio from a specific place in this content.
+	 *  @param frame Frame to start from (after resampling, if applicable)
+	 *  @param length Frames to get (after resampling, if applicable)
+	 *  @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.
+	 */
+	ContentAudio get_audio (AudioStreamPtr stream, Frame time, Frame length, bool accurate);
 
 protected:
+	void audio (AudioStreamPtr stream, boost::shared_ptr<const AudioBuffers>, ContentTime);
+	void flush ();
+	void seek (ContentTime t, bool accurate);
 
-	void audio (boost::shared_ptr<const AudioBuffers>, ContentTime);
+private:
 	boost::shared_ptr<const AudioContent> _audio_content;
+	/** An AudioDecoderStream object to manage each stream in _audio_content */
+	std::map<AudioStreamPtr, boost::shared_ptr<AudioDecoderStream> > _streams;
 };
 
 #endif