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/tinsel | |
| 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/tinsel')
| -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 9a08b6224b..304223ed61 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; |