[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,1.76,1.77
Jamieson Christian
jamieson630 at users.sourceforge.net
Tue Nov 19 09:19:05 CET 2002
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv17296/scummvm/scumm
Modified Files:
scummvm.cpp
Log Message:
Volume control fixes
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- scummvm.cpp 19 Nov 2002 08:08:45 -0000 1.76
+++ scummvm.cpp 19 Nov 2002 17:18:16 -0000 1.77
@@ -157,7 +157,7 @@
}
_silentDigitalImuse = true;
}
- _mixer->setVolume(kDefaultSFXVolume);
+ _mixer->setVolume(kDefaultSFXVolume * kDefaultMasterVolume / 255);
_mixer->setMusicVolume(kDefaultMusicVolume);
// Init iMuse
@@ -1129,20 +1129,21 @@
if (_sound->_sfxMode & 2)
stopTalk();
return;
- } else if (_lastKeyHit == '[') { // [ volume down
- _sound->_sound_volume_master-=5;
- if (_sound->_sound_volume_master < 0)
- _sound->_sound_volume_master = 0;
- if (_imuse) {
- _imuse->set_master_volume(_sound->_sound_volume_master);
- }
- } else if (_lastKeyHit == ']') { // ] volume down
- _sound->_sound_volume_master+=5;
- if (_sound->_sound_volume_master > 128)
- _sound->_sound_volume_master = 128;
- if (_imuse) {
- _imuse->set_master_volume(_sound->_sound_volume_master);
- }
+ } else if (_lastKeyHit == '[') { // [ Music volume down
+ int vol = _sound->_sound_volume_music;
+ if (!(vol & 0xF) && vol)
+ vol -= 16;
+ vol = vol & 0xF0;
+ _sound->_sound_volume_music = vol;
+ if (_imuse)
+ _imuse->set_music_volume (vol);
+ } else if (_lastKeyHit == ']') { // ] Music volume up
+ int vol = _sound->_sound_volume_music;
+ vol = (vol + 16) & 0xFF0;
+ if (vol > 255) vol = 255;
+ _sound->_sound_volume_music = vol;
+ if (_imuse)
+ _imuse->set_music_volume (vol);
} else if (_lastKeyHit == '-') { // - text speed down
_defaultTalkDelay+=5;
if (_defaultTalkDelay > 90)
More information about the Scummvm-git-logs
mailing list