[Scummvm-cvs-logs] CVS: scummvm/gui launcher.cpp,1.105,1.106 options.cpp,1.62,1.63 options.h,1.21,1.22

[Max Horn]

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

Modified Files:
	launcher.cpp options.cpp options.h 
Log Message:
Get rid of the useless & troublesome master_volume

Index: launcher.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/launcher.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- launcher.cpp	25 Dec 2004 23:19:42 -0000	1.105
+++ launcher.cpp	25 Dec 2004 23:43:04 -0000	1.106
@@ -252,8 +252,7 @@
 		ConfMan.hasKey("native_mt32", _domain);
 	_globalAudioOverride->setState(e);
 
-	e = ConfMan.hasKey("master_volume", _domain) ||
-		ConfMan.hasKey("music_volume", _domain) ||
+	e = ConfMan.hasKey("music_volume", _domain) ||
 		ConfMan.hasKey("sfx_volume", _domain) ||
 		ConfMan.hasKey("speech_volume", _domain);
 	_globalVolumeOverride->setState(e);

Index: options.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- options.cpp	2 Dec 2004 00:33:39 -0000	1.62
+++ options.cpp	25 Dec 2004 23:43:05 -0000	1.63
@@ -51,14 +51,13 @@
 // - the save path (use _browser!)
 // - music & graphics driver (but see also the comments on EditGameDialog
 //   for some techincal difficulties with this)
-// - default volumes (sfx/master/music)
+// - default volumes (sfx/speech/music)
 // - aspect ratio, language, platform, subtitles, debug mode/level, cd drive, joystick, multi midi, native mt32
 
 enum {
-	kMasterVolumeChanged	= 'mavc',
 	kMusicVolumeChanged		= 'muvc',
 	kSfxVolumeChanged		= 'sfvc',
-	kSpeechVolumeChanged		= 'vcvc',
+	kSpeechVolumeChanged	= 'vcvc',
 	kChooseSaveDirCmd		= 'chos',
 	kChooseExtraDirCmd		= 'chex'
 };
@@ -71,7 +70,6 @@
 	_enableAudioSettings(false),
 	_multiMidiCheckbox(0), _mt32Checkbox(0), _subCheckbox(0),
 	_enableVolumeSettings(false),
-	_masterVolumeSlider(0), _masterVolumeLabel(0),
 	_musicVolumeSlider(0), _musicVolumeLabel(0),
 	_sfxVolumeSlider(0), _sfxVolumeLabel(0),
 	_speechVolumeSlider(0), _speechVolumeLabel(0) {
@@ -134,13 +132,9 @@
 		_subCheckbox->setState(ConfMan.getBool("subtitles", _domain));
 	}
 
-	if (_masterVolumeSlider) {
+	if (_musicVolumeSlider) {
 		int vol;
 
-		vol = ConfMan.getInt("master_volume", _domain);
-		_masterVolumeSlider->setValue(vol);
-		_masterVolumeLabel->setValue(vol);
-
 		vol = ConfMan.getInt("music_volume", _domain);
 		_musicVolumeSlider->setValue(vol);
 		_musicVolumeLabel->setValue(vol);
@@ -171,14 +165,12 @@
 			}
 		}
 
-		if (_masterVolumeSlider) {
+		if (_musicVolumeSlider) {
 			if (_enableVolumeSettings) {
-				ConfMan.set("master_volume", _masterVolumeSlider->getValue(), _domain);
 				ConfMan.set("music_volume", _musicVolumeSlider->getValue(), _domain);
 				ConfMan.set("sfx_volume", _sfxVolumeSlider->getValue(), _domain);
 				ConfMan.set("speech_volume", _speechVolumeSlider->getValue(), _domain);
 			} else {
-				ConfMan.removeKey("master_volume", _domain);
 				ConfMan.removeKey("music_volume", _domain);
 				ConfMan.removeKey("sfx_volume", _domain);
 				ConfMan.removeKey("speech_volume", _domain);
@@ -214,10 +206,6 @@
 
 void OptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
 	switch (cmd) {
-	case kMasterVolumeChanged:
-		_masterVolumeLabel->setValue(_masterVolumeSlider->getValue());
-		_masterVolumeLabel->draw();
-		break;
 	case kMusicVolumeChanged:
 		_musicVolumeLabel->setValue(_musicVolumeSlider->getValue());
 		_musicVolumeLabel->draw();
@@ -261,8 +249,6 @@
 void OptionsDialog::setVolumeSettingsState(bool enabled) {
 	_enableVolumeSettings = enabled;
 
-	_masterVolumeSlider->setEnabled(enabled);
-	_masterVolumeLabel->setEnabled(enabled);
 	_musicVolumeSlider->setEnabled(enabled);
 	_musicVolumeLabel->setEnabled(enabled);
 	_sfxVolumeSlider->setEnabled(enabled);
@@ -340,12 +326,6 @@
 
 int OptionsDialog::addVolumeControls(GuiObject *boss, int yoffset) {
 	// Volume controllers
-	_masterVolumeSlider = new SliderWidget(boss, 5, yoffset, 185, 12,  "Master volume: ", 100, kMasterVolumeChanged);
-	_masterVolumeLabel = new StaticTextWidget(boss, 200, yoffset + 2, 24, kLineHeight, "100%", kTextAlignLeft);
-	_masterVolumeSlider->setMinValue(0); _masterVolumeSlider->setMaxValue(255);
-	_masterVolumeLabel->setFlags(WIDGET_CLEARBG);
-	yoffset += 16;
-
 	_musicVolumeSlider = new SliderWidget(boss, 5, yoffset, 185, 12, "Music volume: ", 100, kMusicVolumeChanged);
 	_musicVolumeLabel = new StaticTextWidget(boss, 200, yoffset + 2, 24, kLineHeight, "100%", kTextAlignLeft);
 	_musicVolumeSlider->setMinValue(0); _musicVolumeSlider->setMaxValue(255);

Index: options.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- options.h	15 Nov 2004 04:41:51 -0000	1.21
+++ options.h	25 Dec 2004 23:43:05 -0000	1.22
@@ -82,9 +82,6 @@
 	//
 	bool _enableVolumeSettings;
 
-	SliderWidget *_masterVolumeSlider;
-	StaticTextWidget *_masterVolumeLabel;
-
 	SliderWidget *_musicVolumeSlider;
 	StaticTextWidget *_musicVolumeLabel;