[Scummvm-cvs-logs] CVS: scummvm/gui launcher.cpp,1.93,1.94 options.cpp,1.54,1.55 options.h,1.19,1.20

[Torbj?rn Andersson]

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

Modified Files:
	launcher.cpp options.cpp options.h 
Log Message:
Changed "voice_volume" to "speech_volume" for consistency with the Broken
Sword games. (The digial iMUSE code still calls it voice volume, though.)


Index: launcher.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/launcher.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- launcher.cpp	5 Apr 2004 18:24:34 -0000	1.93
+++ launcher.cpp	6 Apr 2004 11:50:35 -0000	1.94
@@ -226,7 +226,7 @@
 	e = ConfMan.hasKey("master_volume", _domain) ||
 		ConfMan.hasKey("music_volume", _domain) ||
 		ConfMan.hasKey("sfx_volume", _domain) ||
-		ConfMan.hasKey("voice_volume", _domain);
+		ConfMan.hasKey("speech_volume", _domain);
 	_globalVolumeOverride->setState(e);
 
 	// TODO: game path

Index: options.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- options.cpp	5 Apr 2004 18:24:35 -0000	1.54
+++ options.cpp	6 Apr 2004 11:50:35 -0000	1.55
@@ -49,7 +49,7 @@
 	kMasterVolumeChanged	= 'mavc',
 	kMusicVolumeChanged		= 'muvc',
 	kSfxVolumeChanged		= 'sfvc',
-	kVoiceVolumeChanged		= 'vcvc',
+	kSpeechVolumeChanged		= 'vcvc',
 	kChooseSaveDirCmd		= 'chos'
 };
 
@@ -64,7 +64,7 @@
 	_masterVolumeSlider(0), _masterVolumeLabel(0),
 	_musicVolumeSlider(0), _musicVolumeLabel(0),
 	_sfxVolumeSlider(0), _sfxVolumeLabel(0),
-	_voiceVolumeSlider(0), _voiceVolumeLabel(0) {
+	_speechVolumeSlider(0), _speechVolumeLabel(0) {
 
 }
 
@@ -140,9 +140,9 @@
 		_sfxVolumeSlider->setValue(vol);
 		_sfxVolumeLabel->setValue(vol);
 
-		vol = ConfMan.getInt("voice_volume", _domain);
-		_voiceVolumeSlider->setValue(vol);
-		_voiceVolumeLabel->setValue(vol);
+		vol = ConfMan.getInt("speech_volume", _domain);
+		_speechVolumeSlider->setValue(vol);
+		_speechVolumeLabel->setValue(vol);
 	}
 }
 
@@ -167,12 +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);
+				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("voice_volume", _domain);
+				ConfMan.removeKey("speech_volume", _domain);
 			}
 		}
 
@@ -217,9 +217,9 @@
 		_sfxVolumeLabel->setValue(_sfxVolumeSlider->getValue());
 		_sfxVolumeLabel->draw();
 		break;
-	case kVoiceVolumeChanged:
-		_voiceVolumeLabel->setValue(_voiceVolumeSlider->getValue());
-		_voiceVolumeLabel->draw();
+	case kSpeechVolumeChanged:
+		_speechVolumeLabel->setValue(_speechVolumeSlider->getValue());
+		_speechVolumeLabel->draw();
 		break;
 	case kOKCmd:
 		setResult(1);
@@ -258,8 +258,8 @@
 	_musicVolumeLabel->setEnabled(enabled);
 	_sfxVolumeSlider->setEnabled(enabled);
 	_sfxVolumeLabel->setEnabled(enabled);
-	_voiceVolumeSlider->setEnabled(enabled);
-	_voiceVolumeLabel->setEnabled(enabled);
+	_speechVolumeSlider->setEnabled(enabled);
+	_speechVolumeLabel->setEnabled(enabled);
 }
 
 int OptionsDialog::addGraphicControls(GuiObject *boss, int yoffset) {
@@ -349,10 +349,10 @@
 	_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);
+	_speechVolumeSlider = new SliderWidget(boss, 5, yoffset, 185, 12, "Speech volume: ", 100, kSpeechVolumeChanged);
+	_speechVolumeLabel = new StaticTextWidget(boss, 200, yoffset + 2, 24, kLineHeight, "100%", kTextAlignLeft);
+	_speechVolumeSlider->setMinValue(0); _speechVolumeSlider->setMaxValue(255);
+	_speechVolumeLabel->setFlags(WIDGET_CLEARBG);
 	yoffset += 16;
 
 	_enableVolumeSettings = true;

Index: options.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- options.h	5 Apr 2004 18:24:35 -0000	1.19
+++ options.h	6 Apr 2004 11:50:35 -0000	1.20
@@ -91,8 +91,8 @@
 	SliderWidget *_sfxVolumeSlider;
 	StaticTextWidget *_sfxVolumeLabel;
 
-	SliderWidget *_voiceVolumeSlider;
-	StaticTextWidget *_voiceVolumeLabel;
+	SliderWidget *_speechVolumeSlider;
+	StaticTextWidget *_speechVolumeLabel;
 };