[Scummvm-cvs-logs] CVS: scummvm/sky/music gmmusic.cpp,1.18,1.19

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Wed Feb 11 10:06:08 CET 2004


Update of /cvsroot/scummvm/scummvm/sky/music
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10791/music

Modified Files:
	gmmusic.cpp 
Log Message:
Fixed bug #870890.


Index: gmmusic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/gmmusic.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- gmmusic.cpp	6 Jan 2004 12:45:33 -0000	1.18
+++ gmmusic.cpp	11 Feb 2004 18:01:26 -0000	1.19
@@ -58,12 +58,7 @@
 
 void GmMusic::setVolume(uint8 volume) {
 
-	uint8 sysEx[6];
-	_musicVolume = volume;
-	if (volume > 0) volume = (volume * 2) / 3 + 43; // GM synths behave kinda logarithmic
-	sysEx[0] = 0x7F; sysEx[1] = 0x7F; sysEx[2] = 0x04; sysEx[3] = 0x01;
-	sysEx[4] = 0; sysEx[5] = volume & 0x7F;
-	_midiDrv->sysEx(sysEx, 6);
+	setFMVolume(volume);
 }
 
 void GmMusic::timerCall(void) {





More information about the Scummvm-git-logs mailing list