From 9f993a1d29120120b3d9c08d56ca1990f4222ae5 Mon Sep 17 00:00:00 2001
From: Paweł Kołodziejski
Date: Sat, 24 Aug 2002 15:31:37 +0000
Subject: synced with scummvm

svn-id: r4821
---
 gui/dialog.cpp | 4 ++--
 gui/gui.cpp    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'gui')

diff --git a/gui/dialog.cpp b/gui/dialog.cpp
index 59355cc031..13651a1a80 100644
--- a/gui/dialog.cpp
+++ b/gui/dialog.cpp
@@ -489,8 +489,8 @@ void SoundDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data)
 		
 		scumm->_imuse->set_music_volume(_soundVolumeMusic);
 		scumm->_imuse->set_master_volume(_soundVolumeMaster);
-		scumm->_mixer->set_volume(_soundVolumeSfx);
-		scumm->_mixer->set_music_volume(_soundVolumeMusic);
+		scumm->_mixer->setVolume(_soundVolumeSfx);
+		scumm->_mixer->setMusicVolume(_soundVolumeMusic);
 		
 		scummcfg->set("master_volume", _soundVolumeMaster);
 		scummcfg->set("music_volume", _soundVolumeMusic);
diff --git a/gui/gui.cpp b/gui/gui.cpp
index 270641ae17..8b2515e4b5 100644
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -621,8 +621,8 @@ void Gui::handleSoundDialogCommand(int cmd)
 
 		_s->_imuse->set_music_volume(_s->_sound->_sound_volume_music);
 		_s->_imuse->set_master_volume(_s->_sound->_sound_volume_master);
-		_s->_mixer->set_volume(_s->_sound->_sound_volume_sfx);
-		_s->_mixer->set_music_volume(_s->_sound->_sound_volume_music);
+		_s->_mixer->setVolume(_s->_sound->_sound_volume_sfx);
+		_s->_mixer->setMusicVolume(_s->_sound->_sound_volume_music);
 
 		scummcfg->set("master_volume", _s->_sound->_sound_volume_master);
 		scummcfg->set("music_volume", _s->_sound->_sound_volume_music);
-- 
cgit v1.2.3