X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_decoder.h;h=750ecd360aa67b705e5b54d730a222ef8fe15455;hb=e80e6a8567dd107f5ea3b708975cb5fd92112a57;hp=bb3aafccd6a8982824f890fa05907ea8def66b96;hpb=cc3900735839ff4b0da0c046b5c606c440ba917a;p=dcpomatic.git

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index bb3aafccd..750ecd360 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,7 +27,7 @@
 #include "decoder.h"
 #include "content.h"
 #include "audio_content.h"
-#include "decoded.h"
+#include "content_audio.h"
 
 class AudioBuffers;
 class Resampler;
@@ -38,22 +38,38 @@ class Resampler;
 class AudioDecoder : public virtual Decoder
 {
 public:
-	AudioDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const AudioContent>);
+	AudioDecoder (boost::shared_ptr<const AudioContent>);
 	
 	boost::shared_ptr<const AudioContent> audio_content () const {
 		return _audio_content;
 	}
 
-	void seek (ContentTime time, bool accurate);
+	/** 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:
 
+	void seek (ContentTime time, bool accurate);
 	void audio (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;
 };
 
 #endif