aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorJochen Hoenicke2003-06-01 16:41:25 +0000
committerJochen Hoenicke2003-06-01 16:41:25 +0000
commit3733667aa56ed50d1efea0734181e5c5b40a80b3 (patch)
tree81757c24e69157997dd6d579c8de879582167f32 /scumm
parent7cfe07fdd301aa10a1e2f8009c2fb34067d88d04 (diff)
downloadscummvm-rg350-3733667aa56ed50d1efea0734181e5c5b40a80b3.tar.gz
scummvm-rg350-3733667aa56ed50d1efea0734181e5c5b40a80b3.tar.bz2
scummvm-rg350-3733667aa56ed50d1efea0734181e5c5b40a80b3.zip
Also call playerV2->set_master_volume when playerV2 exists.
svn-id: r8244
Diffstat (limited to 'scumm')
-rw-r--r--scumm/dialogs.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp
index 11130fb8ac..3c619507d3 100644
--- a/scumm/dialogs.cpp
+++ b/scumm/dialogs.cpp
@@ -24,6 +24,7 @@
#include "sound/mididrv.h"
#include "scumm.h"
#include "imuse.h"
+#include "player_v2.h"
#include "verbs.h"
#include "gui/newgui.h"
@@ -513,6 +514,9 @@ void OptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data
_scumm->_imuse->set_music_volume(_soundVolumeMusic);
_scumm->_imuse->set_master_volume(_soundVolumeMaster);
}
+ if (_scumm->_playerV2) {
+ _scumm->_playerV2->set_master_volume(_soundVolumeMaster);
+ }
_scumm->_mixer->setVolume(_soundVolumeSfx * _soundVolumeMaster / 255);
_scumm->_mixer->setMusicVolume(_soundVolumeMusic);