[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.86,1.87

[Max Horn]

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

Modified Files:
	mixer.cpp 
Log Message:
cleanup

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- mixer.cpp	30 Jul 2003 18:20:45 -0000	1.86
+++ mixer.cpp	31 Jul 2003 01:06:01 -0000	1.87
@@ -677,7 +677,7 @@
 	// TODO: add support for SoundMixer::FLAG_REVERSE_STEREO
 
 	// Get a rate converter instance
-	_converter = makeRateConverter(rate, mixer->getOutputRate(), (flags & SoundMixer::FLAG_STEREO) != 0);
+	_converter = makeRateConverter(rate, mixer->getOutputRate(), _input->isStereo());
 #else
 	_pos = 0;
 	_fpPos = 0;
@@ -768,7 +768,7 @@
 	// TODO: add support for SoundMixer::FLAG_REVERSE_STEREO
 
 	// Get a rate converter instance
-	_converter = makeRateConverter(rate, mixer->getOutputRate(), (flags & SoundMixer::FLAG_STEREO) != 0);
+	_converter = makeRateConverter(rate, mixer->getOutputRate(), _input->isStereo());
 #else
 	_flags = flags;
 	_bufferSize = buffer_size;
@@ -1123,7 +1123,7 @@
 	// Get a rate converter instance
 	vi = ov_info(ov_file, -1);
 	assert(vi->channels == 1 || vi->channels == 2);
-	_converter = makeRateConverter(vi->rate, mixer->getOutputRate(), vi->channels >= 2);
+	_converter = makeRateConverter(vi->rate, mixer->getOutputRate(), _input->isStereo());
 #else
 	_ov_file = ov_file;