[Scummvm-cvs-logs] CVS: scummvm/gui launcher.cpp,1.92,1.93 options.cpp,1.53,1.54 options.h,1.18,1.19

[Pawel Kolodziejski]

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

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

Index: launcher.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/launcher.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- launcher.cpp	25 Mar 2004 21:31:03 -0000	1.92
+++ launcher.cpp	5 Apr 2004 18:24:34 -0000	1.93
@@ -225,7 +225,8 @@
 
 	e = ConfMan.hasKey("master_volume", _domain) ||
 		ConfMan.hasKey("music_volume", _domain) ||
-		ConfMan.hasKey("sfx_volume", _domain);
+		ConfMan.hasKey("sfx_volume", _domain) ||
+		ConfMan.hasKey("voice_volume", _domain);
 	_globalVolumeOverride->setState(e);
 
 	// TODO: game path

Index: options.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- options.cpp	17 Mar 2004 00:07:43 -0000	1.53
+++ options.cpp	5 Apr 2004 18:24:35 -0000	1.54
@@ -49,6 +49,7 @@
 	kMasterVolumeChanged	= 'mavc',
 	kMusicVolumeChanged		= 'muvc',
 	kSfxVolumeChanged		= 'sfvc',
+	kVoiceVolumeChanged		= 'vcvc',
 	kChooseSaveDirCmd		= 'chos'
 };
 
@@ -62,7 +63,8 @@
 	_enableVolumeSettings(false),
 	_masterVolumeSlider(0), _masterVolumeLabel(0),
 	_musicVolumeSlider(0), _musicVolumeLabel(0),
-	_sfxVolumeSlider(0), _sfxVolumeLabel(0) {
+	_sfxVolumeSlider(0), _sfxVolumeLabel(0),
+	_voiceVolumeSlider(0), _voiceVolumeLabel(0) {
 
 }
 
@@ -137,6 +139,10 @@
 		vol = ConfMan.getInt("sfx_volume", _domain);
 		_sfxVolumeSlider->setValue(vol);
 		_sfxVolumeLabel->setValue(vol);
+
+		vol = ConfMan.getInt("voice_volume", _domain);
+		_voiceVolumeSlider->setValue(vol);
+		_voiceVolumeLabel->setValue(vol);
 	}
 }
 
@@ -161,10 +167,12 @@
 				ConfMan.set("master_volume", _masterVolumeSlider->getValue(), _domain);
 				ConfMan.set("music_volume", _musicVolumeSlider->getValue(), _domain);
 				ConfMan.set("sfx_volume", _sfxVolumeSlider->getValue(), _domain);
+				ConfMan.set("voice_volume", _voiceVolumeSlider->getValue(), _domain);
 			} else {
 				ConfMan.removeKey("master_volume", _domain);
 				ConfMan.removeKey("music_volume", _domain);
 				ConfMan.removeKey("sfx_volume", _domain);
+				ConfMan.removeKey("voice_volume", _domain);
 			}
 		}
 
@@ -209,6 +217,10 @@
 		_sfxVolumeLabel->setValue(_sfxVolumeSlider->getValue());
 		_sfxVolumeLabel->draw();
 		break;
+	case kVoiceVolumeChanged:
+		_voiceVolumeLabel->setValue(_voiceVolumeSlider->getValue());
+		_voiceVolumeLabel->draw();
+		break;
 	case kOKCmd:
 		setResult(1);
 		close();
@@ -246,6 +258,8 @@
 	_musicVolumeLabel->setEnabled(enabled);
 	_sfxVolumeSlider->setEnabled(enabled);
 	_sfxVolumeLabel->setEnabled(enabled);
+	_voiceVolumeSlider->setEnabled(enabled);
+	_voiceVolumeLabel->setEnabled(enabled);
 }
 
 int OptionsDialog::addGraphicControls(GuiObject *boss, int yoffset) {
@@ -335,6 +349,12 @@
 	_sfxVolumeLabel->setFlags(WIDGET_CLEARBG);
 	yoffset += 16;
 
+	_voiceVolumeSlider = new SliderWidget(boss, 5, yoffset, 185, 12, "Voice volume: ", 100, kVoiceVolumeChanged);
+	_voiceVolumeLabel = new StaticTextWidget(boss, 200, yoffset + 2, 24, kLineHeight, "100%", kTextAlignLeft);
+	_voiceVolumeSlider->setMinValue(0); _voiceVolumeSlider->setMaxValue(255);
+	_voiceVolumeLabel->setFlags(WIDGET_CLEARBG);
+	yoffset += 16;
+
 	_enableVolumeSettings = true;
 
 	return yoffset;
@@ -344,13 +364,13 @@
 
 
 GlobalOptionsDialog::GlobalOptionsDialog(GameDetector &detector)
-	: OptionsDialog(Common::ConfigManager::kApplicationDomain, 10, 20, 320 - 2 * 10, 200 - 2 * 20) {
+	: OptionsDialog(Common::ConfigManager::kApplicationDomain, 10, 20, 320 - 2 * 10, 200 - 1 * 20) {
 
-	const int vBorder = 5;
+	const int vBorder = 4;
 	int yoffset;
 
 	// The tab widget
-	TabWidget *tab = new TabWidget(this, 0, vBorder, _w, _h - 24 - 2*vBorder);
+	TabWidget *tab = new TabWidget(this, 0, vBorder, _w, _h - 24 - 2 * vBorder);
 
 	//
 	// 1) The graphics tab

Index: options.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- options.h	15 Mar 2004 02:28:47 -0000	1.18
+++ options.h	5 Apr 2004 18:24:35 -0000	1.19
@@ -90,6 +90,9 @@
 
 	SliderWidget *_sfxVolumeSlider;
 	StaticTextWidget *_sfxVolumeLabel;
+
+	SliderWidget *_voiceVolumeSlider;
+	StaticTextWidget *_voiceVolumeLabel;
 };