diff options
| author | Max Horn | 2004-11-28 21:24:02 +0000 |
|---|---|---|
| committer | Max Horn | 2004-11-28 21:24:02 +0000 |
| commit | 1ae87c0fbbbb38950e2364da212adeb96d464d0c (patch) | |
| tree | ca2ce9c9325468b6d6f1b1c8f799bb81853824a5 /scumm/input.cpp | |
| parent | 6c84bbf2bd808c7e72cdcc9e5d5f68562916606b (diff) | |
| download | scummvm-rg350-1ae87c0fbbbb38950e2364da212adeb96d464d0c.tar.gz scummvm-rg350-1ae87c0fbbbb38950e2364da212adeb96d464d0c.tar.bz2 scummvm-rg350-1ae87c0fbbbb38950e2364da212adeb96d464d0c.zip | |
Trying to cleanup the volume control mess inside the SCUMM engine: renamed MusicEngine::setMasterVolume to setMusicVolume; fixed iMuse to use the correct method for setMusicVolume (previously modified the iMuse internal volume control); hooked up the volume control of various other music engines; added ScummEngine::setupVolume method which can be called whenever volume settings change, and which gurantees that those are handled uniformly
svn-id: r15944
Diffstat (limited to 'scumm/input.cpp')
| -rw-r--r-- | scumm/input.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scumm/input.cpp b/scumm/input.cpp index 6263c00d06..9780831915 100644 --- a/scumm/input.cpp +++ b/scumm/input.cpp @@ -382,15 +382,13 @@ void ScummEngine::processKbd(bool smushMode) { vol -= 16; vol = vol & 0xF0; ConfMan.set("music_volume", vol); - if (_imuse) - _imuse->set_music_volume (vol); + setupVolumes(); } else if (_lastKeyHit == ']') { // ] Music volume up int vol = ConfMan.getInt("music_volume"); vol = (vol + 16) & 0xFF0; if (vol > 255) vol = 255; ConfMan.set("music_volume", vol); - if (_imuse) - _imuse->set_music_volume (vol); + setupVolumes(); } else if (_lastKeyHit == '-') { // - text speed down if (_defaultTalkDelay < 9) _defaultTalkDelay++; |