[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.160,1.161

[Torbjörn Andersson]

Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11945/sound

Modified Files:
	mixer.cpp 
Log Message:
Applied patch #957544 to make output sample rate configurable at runtime.


Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- mixer.cpp	28 Feb 2004 12:58:12 -0000	1.160
+++ mixer.cpp	16 Jul 2004 10:24:29 -0000	1.161
@@ -111,11 +111,6 @@
 	_premixProc = 0;
 	int i = 0;
 
-	_outputRate = (uint) _syst->getOutputSampleRate();
-
-	if (_outputRate == 0)
-		error("OSystem returned invalid sample rate");
-
 	_globalVolume = 0;
 	_musicVolume = 0;
 
@@ -125,6 +120,12 @@
 		_channels[i] = 0;
 
 	_mixerReady = _syst->setSoundCallback(mixCallback, this);
+	_outputRate = (uint) _syst->getOutputSampleRate();
+
+	if (_outputRate == 0)
+		error("OSystem returned invalid sample rate");
+
+	debug(1, "Output sample rate: %d Hz", _outputRate);
 }
 
 SoundMixer::~SoundMixer() {