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/draci | |
| 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/draci')
| -rw-r--r-- | engines/draci/sound.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/engines/draci/sound.cpp b/engines/draci/sound.cpp index c8646fff67..0df19794f7 100644 --- a/engines/draci/sound.cpp +++ b/engines/draci/sound.cpp @@ -417,15 +417,16 @@ void Sound::setVolume() { } else { _muteSound = _muteVoice = true; } + if (ConfMan.getBool("mute")) { _muteSound = _muteVoice = true; } - const int soundVolume = _muteSound ? 0: ConfMan.getInt("sfx_volume"); - const int speechVolume = _muteVoice ? 0 : ConfMan.getInt("speech_volume"); + _mixer->muteSoundType(Audio::Mixer::kSFXSoundType, _muteSound); + _mixer->muteSoundType(Audio::Mixer::kSpeechSoundType, _muteVoice); - _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, soundVolume); - _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, speechVolume); + _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume")); + _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume")); } } // End of namespace Draci |