From 349f63ebfc5e24772ceda2d4f91221786d5b0338 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Tue, 6 Apr 2004 11:50:35 +0000
Subject: Changed "voice_volume" to "speech_volume" for consistency with the
 Broken Sword games. (The digial iMUSE code still calls it voice volume,
 though.)

svn-id: r13483
---
 gui/launcher.cpp |  2 +-
 gui/options.cpp  | 32 ++++++++++++++++----------------
 gui/options.h    |  4 ++--
 3 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'gui')

diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 6edb87c27a..186aeeff1c 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -226,7 +226,7 @@ void EditGameDialog::open() {
 	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
diff --git a/gui/options.cpp b/gui/options.cpp
index 5d2d9981e7..b185bf001f 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -49,7 +49,7 @@ enum {
 	kMasterVolumeChanged	= 'mavc',
 	kMusicVolumeChanged		= 'muvc',
 	kSfxVolumeChanged		= 'sfvc',
-	kVoiceVolumeChanged		= 'vcvc',
+	kSpeechVolumeChanged		= 'vcvc',
 	kChooseSaveDirCmd		= 'chos'
 };
 
@@ -64,7 +64,7 @@ OptionsDialog::OptionsDialog(const String &domain, int x, int y, int w, int h)
 	_masterVolumeSlider(0), _masterVolumeLabel(0),
 	_musicVolumeSlider(0), _musicVolumeLabel(0),
 	_sfxVolumeSlider(0), _sfxVolumeLabel(0),
-	_voiceVolumeSlider(0), _voiceVolumeLabel(0) {
+	_speechVolumeSlider(0), _speechVolumeLabel(0) {
 
 }
 
@@ -140,9 +140,9 @@ void OptionsDialog::open() {
 		_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 @@ void OptionsDialog::close() {
 				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 @@ void OptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data
 		_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 @@ void OptionsDialog::setVolumeSettingsState(bool enabled) {
 	_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 @@ int OptionsDialog::addVolumeControls(GuiObject *boss, int yoffset) {
 	_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;
diff --git a/gui/options.h b/gui/options.h
index 0ef6c266f2..44ff0a7d4c 100644
--- a/gui/options.h
+++ b/gui/options.h
@@ -91,8 +91,8 @@ private:
 	SliderWidget *_sfxVolumeSlider;
 	StaticTextWidget *_sfxVolumeLabel;
 
-	SliderWidget *_voiceVolumeSlider;
-	StaticTextWidget *_voiceVolumeLabel;
+	SliderWidget *_speechVolumeSlider;
+	StaticTextWidget *_speechVolumeLabel;
 };
 
 
-- 
cgit v1.2.3