[Scummvm-cvs-logs] CVS: scummvm gui.cpp,1.60,1.61 scummvm.cpp,1.188,1.189 sound.cpp,1.105,1.106

James Brown ender at users.sourceforge.net
Sat Jul 20 23:56:02 CEST 2002


Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv18945

Modified Files:
	gui.cpp scummvm.cpp sound.cpp 
Log Message:
Apply patch from Torbjörn Andersson to make MP3_CDMUSIC mixer use
music_volume instead of sfx_volume.




Index: gui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- gui.cpp	13 Jul 2002 17:54:20 -0000	1.60
+++ gui.cpp	21 Jul 2002 06:55:32 -0000	1.61
@@ -609,6 +609,7 @@
 		imuse->set_music_volume(_s->_sound_volume_music);
 		imuse->set_master_volume(_s->_sound_volume_master);
 		_s->_mixer->set_volume(_s->_sound_volume_sfx);
+		_s->_mixer->set_music_volume(_s->_sound_volume_music);
 		scummcfg->set("master_volume", _s->_sound_volume_master);
 		scummcfg->set("music_volume", _s->_sound_volume_music);
 		scummcfg->set("sfx_volume", _s->_sound_volume_sfx);

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -d -r1.188 -r1.189
--- scummvm.cpp	20 Jul 2002 08:00:42 -0000	1.188
+++ scummvm.cpp	21 Jul 2002 06:55:32 -0000	1.189
@@ -1525,6 +1525,7 @@
 		}   
 	} 
 	scumm->_mixer->set_volume(128);
+	scumm->_mixer->set_music_volume(128);
 
 	/* HACK !!! */
 	g_scumm = scumm;

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- sound.cpp	20 Jul 2002 07:57:22 -0000	1.105
+++ sound.cpp	21 Jul 2002 06:55:32 -0000	1.106
@@ -527,6 +527,7 @@
 		se->set_master_volume(_sound_volume_master);
 		se->set_music_volume(_sound_volume_music);
 		_mixer->set_volume(_sound_volume_sfx);
+		_mixer->set_music_volume(_sound_volume_music);
 	}
 	_sfxFile = openSfxFile();
 }





More information about the Scummvm-git-logs mailing list