diff options
Diffstat (limited to 'sword2/controls.cpp')
| -rw-r--r-- | sword2/controls.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sword2/controls.cpp b/sword2/controls.cpp index 5d80b8ca8c..8f42521696 100644 --- a/sword2/controls.cpp +++ b/sword2/controls.cpp @@ -945,9 +945,9 @@ OptionsDialog::OptionsDialog(Sword2Engine *vm) : Dialog(vm) { _speechSwitch->setValue(!_vm->_sound->isSpeechMute()); _fxSwitch->setValue(!_vm->_sound->isFxMute()); - _musicSlider->setValue(_mixer->getVolumeForSoundType(SoundMixer::kMusicAudioDataType)); - _speechSlider->setValue(_mixer->getVolumeForSoundType(SoundMixer::kSpeechAudioDataType)); - _fxSlider->setValue(_mixer->getVolumeForSoundType(SoundMixer::kSFXAudioDataType)); + _musicSlider->setValue(_mixer->getVolumeForSoundType(SoundMixer::kMusicSoundType)); + _speechSlider->setValue(_mixer->getVolumeForSoundType(SoundMixer::kSpeechSoundType)); + _fxSlider->setValue(_mixer->getVolumeForSoundType(SoundMixer::kSFXSoundType)); _gfxSlider->setValue(_vm->_screen->getRenderLevel()); _gfxPreview->setState(_vm->_screen->getRenderLevel()); @@ -997,7 +997,7 @@ void OptionsDialog::onAction(Widget *widget, int result) { if (widget == _musicSwitch) { _vm->_sound->muteMusic(result != 0); } else if (widget == _musicSlider) { - _vm->_mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, result); + _vm->_mixer->setVolumeForSoundType(SoundMixer::kMusicSoundType, result); _vm->_sound->muteMusic(result == 0); _musicSwitch->setValue(result != 0); } else if (widget == _speechSlider) { @@ -1015,9 +1015,9 @@ void OptionsDialog::onAction(Widget *widget, int result) { _vm->_sound->muteSpeech(!_speechSwitch->getValue()); _vm->_sound->muteFx(!_fxSwitch->getValue()); _vm->_sound->setReverseStereo(_reverseStereoSwitch->getValue()); - _mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, _musicSlider->getValue()); - _mixer->setVolumeForSoundType(SoundMixer::kSpeechAudioDataType, _speechSlider->getValue()); - _mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, _fxSlider->getValue()); + _mixer->setVolumeForSoundType(SoundMixer::kMusicSoundType, _musicSlider->getValue()); + _mixer->setVolumeForSoundType(SoundMixer::kSpeechSoundType, _speechSlider->getValue()); + _mixer->setVolumeForSoundType(SoundMixer::kSFXSoundType, _fxSlider->getValue()); _vm->_screen->setRenderLevel(_gfxSlider->getValue()); _vm->writeSettings(); |