[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.28,1.29

[Nicolas Bacca]

Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv30269

Modified Files:
	mixer.cpp 
Log Message:
Adapt MAD sampling rate to the real sampling rate for WinCE

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- mixer.cpp	19 Nov 2002 01:50:15 -0000	1.28
+++ mixer.cpp	21 Nov 2002 08:46:01 -0000	1.29
@@ -777,8 +777,9 @@
 
 	mad_stream_init(&_stream);
 #ifdef _WIN32_WCE
-	// 11 kHz on WinCE
-	mad_stream_options(&_stream, MAD_OPTION_HALFSAMPLERATE);
+	// 11 kHz on WinCE if necessary
+	if ((uint)_mixer->_syst->property(OSystem::PROP_GET_SAMPLE_RATE, 0) != 22050)
+		mad_stream_options(&_stream, MAD_OPTION_HALFSAMPLERATE);
 #endif
 	mad_frame_init(&_frame);
 	mad_synth_init(&_synth);
@@ -896,8 +897,9 @@
 
 	mad_stream_init(&_stream);
 #ifdef _WIN32_WCE
-	// 11 kHz on WinCE
-	mad_stream_options(&_stream, MAD_OPTION_HALFSAMPLERATE);
+	// 11 kHz on WinCE if necessary
+	if ((uint)_mixer->_syst->property(OSystem::PROP_GET_SAMPLE_RATE, 0) != 22050)
+		mad_stream_options(&_stream, MAD_OPTION_HALFSAMPLERATE);
 #endif
 	mad_frame_init(&_frame);
 	mad_synth_init(&_synth);