From d9362bdd24f01e4c833e89d63ac3816f36eae36e Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 25 Jul 2013 13:26:40 +0100
Subject: Move resampling back into AudioDecoder and fix various screw-ups with
 audio in the player.

---
 src/lib/audio_decoder.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/lib/audio_decoder.h')

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 2ad53da8b..b1ec54a7b 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -29,6 +29,7 @@
 #include "audio_content.h"
 
 class AudioBuffers;
+class Resampler;
 
 /** @class AudioDecoder.
  *  @brief Parent class for audio decoders.
@@ -36,7 +37,7 @@ class AudioBuffers;
 class AudioDecoder : public virtual Decoder
 {
 public:
-	AudioDecoder (boost::shared_ptr<const Film>);
+	AudioDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const AudioContent>);
 
 	/** Emitted when some audio data is ready */
 	boost::signals2::signal<void (boost::shared_ptr<const AudioBuffers>, AudioContent::Frame)> Audio;
@@ -44,7 +45,9 @@ public:
 protected:
 
 	void audio (boost::shared_ptr<const AudioBuffers>, AudioContent::Frame);
+	/** Frame index of next emission (post resampling) */
 	AudioContent::Frame _audio_position;
+	boost::shared_ptr<Resampler> _resampler;
 };
 
 #endif
-- 
cgit v1.2.3