[Scummvm-cvs-logs] CVS: scummvm/simon sound.cpp,1.41,1.42

Max Horn fingolfin at users.sourceforge.net
Fri Sep 5 14:07:04 CEST 2003


Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv2778/simon

Modified Files:
	sound.cpp 
Log Message:
added default volume/pan values

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- sound.cpp	5 Sep 2003 06:22:10 -0000	1.41
+++ sound.cpp	5 Sep 2003 21:06:32 -0000	1.42
@@ -174,7 +174,7 @@
 	byte *buffer = (byte *)malloc(data[1]);
 	_file->read(buffer, data[1]);
 
-	return _mixer->playRaw(handle, buffer, data[1], FROM_LE_32(wave_hdr.samples_per_sec), flags, 255, 0);
+	return _mixer->playRaw(handle, buffer, data[1], FROM_LE_32(wave_hdr.samples_per_sec), flags);
 }
 
 int VocSound::playSound(uint sound, PlayingSoundHandle *handle, byte flags) {
@@ -212,7 +212,7 @@
 	byte *buffer = (byte *)malloc(size);
 	_file->read(buffer, size);
 
-	return _mixer->playRaw(handle, buffer, size, samples_per_sec, flags, 255, 0);
+	return _mixer->playRaw(handle, buffer, size, samples_per_sec, flags);
 }
 
 int RawSound::playSound(uint sound, PlayingSoundHandle *handle, byte flags) {
@@ -226,7 +226,7 @@
 	byte *buffer = (byte *)malloc(size);
 	_file->read(buffer, size);
 
-	return _mixer->playRaw(handle, buffer, size, 22050, flags, 255, 0);
+	return _mixer->playRaw(handle, buffer, size, 22050, flags);
 }
 
 #ifdef USE_MAD
@@ -245,7 +245,7 @@
 
 	uint32 size = _offsets[sound+1] - _offsets[sound];
 
-	return _mixer->playMP3(handle, _file, size, 255, 0);
+	return _mixer->playMP3(handle, _file, size);
 }
 #endif
 





More information about the Scummvm-git-logs mailing list