diff options
| author | Paweł Kołodziejski | 2004-04-05 18:24:36 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2004-04-05 18:24:36 +0000 |
| commit | f141ad488b1fd4d96214cb35e0ab4034173efb81 (patch) | |
| tree | 88bc5d0055ef63fc6afa9180620c3a35c5e661f4 /scumm/dialogs.cpp | |
| parent | 781809ee2be3c1ad15e3e9a62296f27241ac9cd0 (diff) | |
| download | scummvm-rg350-f141ad488b1fd4d96214cb35e0ab4034173efb81.tar.gz scummvm-rg350-f141ad488b1fd4d96214cb35e0ab4034173efb81.tar.bz2 scummvm-rg350-f141ad488b1fd4d96214cb35e0ab4034173efb81.zip | |
added voice group volume to scumm engine for imuse digital and implemeted volume groups control
svn-id: r13468
Diffstat (limited to 'scumm/dialogs.cpp')
| -rw-r--r-- | scumm/dialogs.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp index cd3d2adf4d..e58fa6d270 100644 --- a/scumm/dialogs.cpp +++ b/scumm/dialogs.cpp @@ -30,6 +30,7 @@ #include "scumm/sound.h" #include "scumm/scumm.h" #include "scumm/imuse.h" +#include "scumm/imuse_digi/dimuse.h" #include "scumm/player_v2.h" #include "scumm/verbs.h" #include "sound/mididrv.h" @@ -430,7 +431,7 @@ ConfigDialog::ConfigDialog(ScummEngine *scumm) // // Some misc options // - subtitlesCheckbox = new GUI::CheckboxWidget(this, 15, 62, 200, 16, "Show subtitles", 0, 'S'); + subtitlesCheckbox = new GUI::CheckboxWidget(this, 15, 78, 200, 16, "Show subtitles", 0, 'S'); // // Create the sub dialog(s) @@ -469,10 +470,20 @@ void ConfigDialog::close() { int soundVolumeMaster = ConfMan.getInt("master_volume"); int soundVolumeMusic = ConfMan.getInt("music_volume"); int soundVolumeSfx = ConfMan.getInt("sfx_volume"); + int soundVolumeVoice = ConfMan.getInt("voice_volume"); + + if (_vm->_imuseDigital) { + _vm->_mixer->setVolume(soundVolumeMaster); + _vm->_imuseDigital->setGroupMusicVolume(soundVolumeMusic / 2); + _vm->_imuseDigital->setGroupSfxVolume(soundVolumeSfx / 2); + _vm->_imuseDigital->setGroupVoiceVolume(soundVolumeVoice / 2); + return; + } if (_vm->_imuse) { _vm->_imuse->set_music_volume(soundVolumeMusic); } + if (_vm->_musicEngine) { _vm->_musicEngine->setMasterVolume(soundVolumeMaster); } |