diff options
| author | Johannes Schickel | 2011-03-20 23:58:08 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2011-04-13 23:48:51 +0200 |
| commit | 507dd88f9c43a8a038da519bdfe2e9b62456e7fe (patch) | |
| tree | 238795419ce6ed9d5b91ca04910d4070ba258fd1 | |
| parent | f9a459d70e0a0de620ac931716481a938a725733 (diff) | |
| download | scummvm-rg350-507dd88f9c43a8a038da519bdfe2e9b62456e7fe.tar.gz scummvm-rg350-507dd88f9c43a8a038da519bdfe2e9b62456e7fe.tar.bz2 scummvm-rg350-507dd88f9c43a8a038da519bdfe2e9b62456e7fe.zip | |
TINSEL: Clean up code a bit, since we now handle digital audio muting differently.
| -rw-r--r-- | engines/tinsel/sound.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp index 1fcdb4dcf9..3fef59edef 100644 --- a/engines/tinsel/sound.cpp +++ b/engines/tinsel/sound.cpp @@ -131,13 +131,9 @@ bool SoundManager::playSample(int id, Audio::Mixer::SoundType type, Audio::Sound error(FILE_IS_CORRUPT, _vm->getSampleFile(sampleLanguage)); // FIXME: Should set this in a different place ;) - bool mute = false; - if (ConfMan.hasKey("mute")) - mute = ConfMan.getBool("mute"); - - _vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, mute ? 0 : _vm->_config->_soundVolume); + _vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, _vm->_config->_soundVolume); //_vm->_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, soundVolumeMusic); - _vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, mute ? 0 : _vm->_config->_voiceVolume); + _vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, _vm->_config->_voiceVolume); Audio::AudioStream *sampleStream = 0; @@ -325,13 +321,9 @@ bool SoundManager::playSample(int id, int sub, bool bLooped, int x, int y, int p } // FIXME: Should set this in a different place ;) - bool mute = false; - if (ConfMan.hasKey("mute")) - mute = ConfMan.getBool("mute"); - - _vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, mute ? 0 : _vm->_config->_soundVolume); + _vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, _vm->_config->_soundVolume); //_vm->_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, soundVolumeMusic); - _vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, mute ? 0 : _vm->_config->_voiceVolume); + _vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, _vm->_config->_voiceVolume); curChan->sampleNum = id; curChan->subSample = sub; |