diff options
| author | Johannes Schickel | 2011-04-18 15:57:04 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2011-04-18 15:59:34 +0200 |
| commit | 7b4a4d9fa65fb843c1fed77197e7cd21ca7f93b8 (patch) | |
| tree | 600130f772946fc8a07b5bf6d800434bd0a8e666 /engines/engine.cpp | |
| parent | 12af50f2ffd7b000ac97a5cea0a596c96fb54924 (diff) | |
| parent | 1d60b266879d58663827e7ce0b727c201433394d (diff) | |
| download | scummvm-rg350-7b4a4d9fa65fb843c1fed77197e7cd21ca7f93b8.tar.gz scummvm-rg350-7b4a4d9fa65fb843c1fed77197e7cd21ca7f93b8.tar.bz2 scummvm-rg350-7b4a4d9fa65fb843c1fed77197e7cd21ca7f93b8.zip | |
Merge pull request "New mixer mute handling."
See https://github.com/scummvm/scummvm/pull/12 for more information.
Diffstat (limited to 'engines/engine.cpp')
| -rw-r--r-- | engines/engine.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/engines/engine.cpp b/engines/engine.cpp index 0e5e58bc72..71f9b68f44 100644 --- a/engines/engine.cpp +++ b/engines/engine.cpp @@ -439,10 +439,14 @@ void Engine::syncSoundSettings() { if (ConfMan.hasKey("mute")) mute = ConfMan.getBool("mute"); - _mixer->setVolumeForSoundType(Audio::Mixer::kPlainSoundType, (mute ? 0 : Audio::Mixer::kMaxMixerVolume)); - _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, (mute ? 0 : soundVolumeMusic)); - _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, (mute ? 0 : soundVolumeSFX)); - _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, (mute ? 0 : soundVolumeSpeech)); + _mixer->muteSoundType(Audio::Mixer::kPlainSoundType, mute); + _mixer->muteSoundType(Audio::Mixer::kMusicSoundType, mute); + _mixer->muteSoundType(Audio::Mixer::kSFXSoundType, mute); + _mixer->muteSoundType(Audio::Mixer::kSpeechSoundType, mute); + _mixer->setVolumeForSoundType(Audio::Mixer::kPlainSoundType, Audio::Mixer::kMaxMixerVolume); + _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, soundVolumeMusic); + _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, soundVolumeSFX); + _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, soundVolumeSpeech); } void Engine::flipMute() { |