[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.92,1.93 rate.h,1.11,1.12

Max Horn fingolfin at users.sourceforge.net
Fri Aug 1 17:30:19 CEST 2003


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

Modified Files:
	mixer.cpp rate.h 
Log Message:
disable debug output

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- mixer.cpp	1 Aug 2003 16:32:11 -0000	1.92
+++ mixer.cpp	2 Aug 2003 00:29:53 -0000	1.93
@@ -674,10 +674,9 @@
 
 	// Get a rate converter instance
 	_converter = makeRateConverter(rate, mixer->getOutputRate(), _input->isStereo());
-	printf("   data has %d bits and is %s\n",
-			((flags & SoundMixer::FLAG_16BITS) ? 16 : 8),
-			((flags & SoundMixer::FLAG_UNSIGNED) ? "unsigned" : "signed"));
-
+//	printf("   data has %d bits and is %s\n",
+//			((flags & SoundMixer::FLAG_16BITS) ? 16 : 8),
+//			((flags & SoundMixer::FLAG_UNSIGNED) ? "unsigned" : "signed"));
 #else
 	_pos = 0;
 	_fpPos = 0;
@@ -768,9 +767,9 @@
 
 	// Get a rate converter instance
 	_converter = makeRateConverter(rate, mixer->getOutputRate(), _input->isStereo());
-	printf("   data has %d bits and is %s\n",
-			((flags & SoundMixer::FLAG_16BITS) ? 16 : 8),
-			((flags & SoundMixer::FLAG_UNSIGNED) ? "unsigned" : "signed"));
+//	printf("   data has %d bits and is %s\n",
+//			((flags & SoundMixer::FLAG_16BITS) ? 16 : 8),
+//			((flags & SoundMixer::FLAG_UNSIGNED) ? "unsigned" : "signed"));
 #else
 	_flags = flags;
 	_bufferSize = buffer_size;
@@ -1002,7 +1001,7 @@
 	_input = new MP3InputStream(file, duration);
 
 	// Get a rate converter instance
-printf("ChannelMP3CDMusic: inrate %d, outrate %d, stereo %d\n", _input->getRate(), mixer->getOutputRate(), _input->isStereo());
+//printf("ChannelMP3CDMusic: inrate %d, outrate %d, stereo %d\n", _input->getRate(), mixer->getOutputRate(), _input->isStereo());
 	_converter = makeRateConverter(_input->getRate(), mixer->getOutputRate(), _input->isStereo());
 }
 #else

Index: rate.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/rate.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- rate.h	1 Aug 2003 12:49:24 -0000	1.11
+++ rate.h	2 Aug 2003 00:29:53 -0000	1.12
@@ -94,7 +94,6 @@
 };
 
 static inline RateConverter *makeRateConverter(st_rate_t inrate, st_rate_t outrate, bool stereo) {
-printf("makeRateConverter: inrate %d, outrate %d, %s\n", inrate, outrate, (stereo ? "stereo" : "mono"));
 	if (inrate != outrate) {
 		return new LinearRateConverter(inrate, outrate);
 		//return new ResampleRateConverter(inrate, outrate, 1);





More information about the Scummvm-git-logs mailing list