[Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.108,1.109 script_v8.cpp,2.246,2.247 scumm.cpp,1.16,1.17

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16526/scumm

Modified Files:
	dialogs.cpp script_v8.cpp scumm.cpp 
Log Message:
added voice group volume to scumm engine for imuse digital and implemeted volume groups control

Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- dialogs.cpp	28 Mar 2004 13:02:27 -0000	1.108
+++ dialogs.cpp	5 Apr 2004 18:24:35 -0000	1.109
@@ -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 @@
 	//
 	// 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 @@
 	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);
 	}

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.246
retrieving revision 2.247
diff -u -d -r2.246 -r2.247
--- script_v8.cpp	4 Apr 2004 19:24:03 -0000	2.246
+++ script_v8.cpp	5 Apr 2004 18:24:35 -0000	2.247
@@ -1461,14 +1461,14 @@
 		push(a->talkStartFrame);
 		}
 		break;
-	case 0xDD:		// getMasterSFXVol
-		push(ConfMan.getInt("sfx_volume") / 2);
+	case 0xDD:		// getGroupSfxVol
+		push(_imuseDigital->getGroupSfxVolume());
 		break;
-	case 0xDE:		// getMasterVoiceVol
-		push(ConfMan.getInt("sfx_volume") / 2);
+	case 0xDE:		// getGroupVoiceVol
+		push(_imuseDigital->getGroupVoiceVolume());
 		break;
-	case 0xDF:		// getMasterMusicVol
-		push(ConfMan.getInt("music_volume") / 2);
+	case 0xDF:		// getGroupMusicVol
+		push(_imuseDigital->getGroupMusicVolume());
 		break;
 	case 0xE0:		// readRegistryValue
 		{

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- scumm.cpp	3 Apr 2004 19:41:30 -0000	1.16
+++ scumm.cpp	5 Apr 2004 18:24:35 -0000	1.17
@@ -711,6 +711,10 @@
 	// Init iMuse
 	if (_features & GF_DIGI_IMUSE) {
 		_musicEngine = _imuseDigital = new IMuseDigital(this);
+		_mixer->setVolume(ConfMan.getInt("master_volume"));
+		_imuseDigital->setGroupMusicVolume(ConfMan.getInt("music_volume") / 2);
+		_imuseDigital->setGroupSfxVolume(ConfMan.getInt("sfx_volume") / 2);
+		_imuseDigital->setGroupVoiceVolume(ConfMan.getInt("voice_volume") / 2);
 	} else if ((_features & GF_AMIGA) && (_version == 2)) {
 		_musicEngine = new Player_V2A(this);
 	} else if ((_features & GF_AMIGA) && (_version == 3)) {