X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_decoder.h;h=c83c356b7488c157dc85a6cd589dc7f256d029d5;hb=2c0478d2b33906845b9d910668b12fe3e8f03a7c;hp=1da8a676f37c7f59c3deeb46a166829e60ff1687;hpb=f45cbb73068321d857249aaa21f770b87493c7c2;p=dcpomatic.git

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 1da8a676f..c83c356b7 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
@@ -24,33 +24,45 @@
 #ifndef DCPOMATIC_AUDIO_DECODER_H
 #define DCPOMATIC_AUDIO_DECODER_H
 
-#include "audio_source.h"
 #include "decoder.h"
-extern "C" {
-#include <libswresample/swresample.h>
-}
+#include "content.h"
+#include "audio_content.h"
+#include "content_audio.h"
 
-class AudioContent;
+class AudioBuffers;
+class Resampler;
 
 /** @class AudioDecoder.
  *  @brief Parent class for audio decoders.
  */
-class AudioDecoder : public AudioSource, public virtual Decoder
+class AudioDecoder : public virtual Decoder
 {
 public:
-	AudioDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const AudioContent>);
-	~AudioDecoder ();
+	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:
 
-	void audio (boost::shared_ptr<const AudioBuffers>, Time);
-	bool audio_done () const;
+	void seek (ContentTime time, bool accurate);
+	void audio (boost::shared_ptr<const AudioBuffers>, ContentTime);
+	void flush ();
 
-	Time _next_audio;
 	boost::shared_ptr<const AudioContent> _audio_content;
-
-private:	
-	SwrContext* _swr_context;
+	boost::shared_ptr<Resampler> _resampler;
+	boost::optional<AudioFrame> _audio_position;
+	/** Currently-available decoded audio data */
+	ContentAudio _decoded_audio;
 };
 
 #endif