Replace Audio::MixerImpl::setOutputRate with a new 'sampleRate' param to the MixerImpl constructor

svn-id: r48238

1 files changed, 4 insertions, 15 deletions

diff --git a/sound/mixer_intern.h b/sound/mixer_intern.h
index a1037f1107..2ccd1ff2bf 100644
--- a/sound/mixer_intern.h
+++ b/sound/mixer_intern.h
@@ -60,7 +60,7 @@ private:
 	OSystem *_syst;
 	Common::Mutex _mutex;
 
-	uint _sampleRate;
+	const uint _sampleRate;
 	bool _mixerReady;
 	uint32 _handleSeed;
 
@@ -69,7 +69,8 @@ private:
 
 
 public:
-	MixerImpl(OSystem *system);
+
+	MixerImpl(OSystem *system, uint sampleRate);
 	~MixerImpl();
 
 	virtual bool isReady() const { return _mixerReady; }
@@ -123,21 +124,9 @@ public:
 	/**
 	 * Set the internal 'is ready' flag of the mixer.
 	 * Backends should invoke Mixer::setReady(true) once initialisation of
-	 * their audio system has been completed (and in particular, *after*
-	 * setOutputRate() has been called).
+	 * their audio system has been completed.
 	 */
 	void setReady(bool ready);
-
-	/**
-	 * Set the output sample rate.
-	 *
-	 * @param sampleRate	the new output sample rate
-	 *
-	 * @note Right now, this can be done exactly ONCE. That is, the mixer
-	 * currently does not support changing the output sample rate after it
-	 * has been set for the first time.  This may change in the future.
-	 */
-	void setOutputRate(uint sampleRate);
 };