X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Faudio_decoder.h;h=0b0d306f647469fd4d09654338e5fd932cdd8c3e;hb=308488324dbc4d8b709d3fb1dc9fee0479346c21;hp=fb9f23f034be4bd410b5b50bb5ec05c7611e16a7;hpb=64a2f1bb6a7b972607fa363631ef7a47444e8217;p=dcpomatic.git

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index fb9f23f03..0b0d306f6 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,32 +24,46 @@
 #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);
+	void seek (ContentTime time, bool accurate);
+	void audio (boost::shared_ptr<const AudioBuffers>, ContentTime);
+	void flush ();
+	void reset_decoded_audio ();
 
-	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