[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.220,1.221

Pawel Kolodziejski aquadran at users.sourceforge.net
Thu Sep 4 23:23:02 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv26245/scummvm/scumm

Modified Files:
	sound.cpp 
Log Message:
fixes for uninitialized pan and volume

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -d -r1.220 -r1.221
--- sound.cpp	5 Sep 2003 03:29:29 -0000	1.220
+++ sound.cpp	5 Sep 2003 06:22:09 -0000	1.221
@@ -917,7 +917,7 @@
 			playSfxSound_Vorbis(data, file_size, handle);
 		} else {
 #ifdef USE_MAD
-			_scumm->_mixer->playMP3(handle, file, file_size);
+			_scumm->_mixer->playMP3(handle, file, file_size, 255, 0);
 #endif
 		}
 		return;
@@ -1473,7 +1473,7 @@
 		delete f;
 		free(sound);
 	} else
-		_scumm->_mixer->playVorbis(handle, ov_file, 0, false);
+		_scumm->_mixer->playVorbis(handle, ov_file, 0, false, 255, 0);
 #endif
 }
 
@@ -1750,7 +1750,7 @@
 	}
 
 	// Play it
-	return mixer->playMP3CDTrack(handle, _file, durationTime);
+	return mixer->playMP3CDTrack(handle, _file, durationTime, 255, 0);
 }
 
 MP3TrackInfo::~MP3TrackInfo() {
@@ -1854,7 +1854,7 @@
 #endif
 	return mixer->playVorbis(handle, &_ov_file,
 				 duration * ov_info(&_ov_file, -1)->rate / 75,
-				 true);
+				 true, 255, 0);
 }
 
 VorbisTrackInfo::~VorbisTrackInfo() {





More information about the Scummvm-git-logs mailing list