aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorbjörn Andersson2004-04-06 11:50:35 +0000
committerTorbjörn Andersson2004-04-06 11:50:35 +0000
commit349f63ebfc5e24772ceda2d4f91221786d5b0338 (patch)
treea8a3b6c9698c92132921d8eb2f48618d89cea6a0
parentc7d22d5a6f2610dd12ecf0ce41bec348ecb1cbf0 (diff)
downloadscummvm-rg350-349f63ebfc5e24772ceda2d4f91221786d5b0338.tar.gz
scummvm-rg350-349f63ebfc5e24772ceda2d4f91221786d5b0338.tar.bz2
scummvm-rg350-349f63ebfc5e24772ceda2d4f91221786d5b0338.zip
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
Diffstat
-rw-r--r--README2
-rw-r--r--base/gameDetector.cpp8
-rw-r--r--doc/08.tex3
-rw-r--r--gui/launcher.cpp2
-rw-r--r--gui/options.cpp32
-rw-r--r--gui/options.h4
-rw-r--r--scumm/dialogs.cpp4
7 files changed, 27 insertions, 28 deletions
diff --git a/README b/README
index 51df90dc12..d8f0204dcf 100644
--- a/README
+++ b/README
@@ -933,6 +933,7 @@ The following keywords are recognized:
there is a true Roland MT-32 available.
sfx_volume number The sfx volume setting (0-255)
tempo number The music tempo (50-200) (default: 100)
+ speech_volume number The speech volume setting (0-255)
copy_protection bool Enable copy protection in SCUMM games ,when
ScummVM disables it by default.
@@ -953,7 +954,6 @@ Broken Sword II adds the following non-standard keywords:
reverse_stereo bool If true, stereo channels are reversed
sfx_mute bool If true, sound effects are muted
speech_mute bool If true, speech is muted
- speech_volume number The speech volume setting (0-255)
Flight of the Amazon Queen adds the following non-standard keywords:
diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp
index 19f638019d..e633e520c5 100644
--- a/base/gameDetector.cpp
+++ b/base/gameDetector.cpp
@@ -63,7 +63,7 @@ static const char USAGE_STRING[] =
" -m, --music-volume=NUM Set the music volume, 0-255 (default: 192)\n"
" -o, --master-volume=NUM Set the master volume, 0-255 (default: 192)\n"
" -s, --sfx-volume=NUM Set the sfx volume, 0-255 (default: 192)\n"
- " -r, --voice-volume=NUM Set the voice volume, 0-255 (default: 192)\n"
+ " -r, --speech-volume=NUM Set the speech volume, 0-255 (default: 192)\n"
" -n, --subtitles Enable subtitles (use with games that have voice)\n"
" -b, --boot-param=NUM Pass number to the boot script (boot param)\n"
" -d, --debuglevel=NUM Set debug verbosity level\n"
@@ -108,7 +108,7 @@ GameDetector::GameDetector() {
ConfMan.registerDefault("master_volume", 192);
ConfMan.registerDefault("music_volume", 192);
ConfMan.registerDefault("sfx_volume", 192);
- ConfMan.registerDefault("voice_volume", 192);
+ ConfMan.registerDefault("speech_volume", 192);
ConfMan.registerDefault("multi_midi", false);
ConfMan.registerDefault("native_mt32", false);
@@ -369,8 +369,8 @@ void GameDetector::parseCommandLine(int argc, char **argv) {
ConfMan.set("sfx_volume", (int)strtol(option, 0, 10), kTransientDomain);
END_OPTION
- DO_OPTION('r', "voice-volume")
- ConfMan.set("voice_volume", (int)strtol(option, 0, 10), kTransientDomain);
+ DO_OPTION('r', "speech-volume")
+ ConfMan.set("speech_volume", (int)strtol(option, 0, 10), kTransientDomain);
END_OPTION
DO_OPTION_CMD('t', "list-targets")
diff --git a/doc/08.tex b/doc/08.tex
index 6d335eeaba..4ae64fc11f 100644
--- a/doc/08.tex
+++ b/doc/08.tex
@@ -101,6 +101,7 @@ The following keywords are recognized:
& there is a true Roland MT-32 available.\\
sfx\_volume &number The sfx volume setting (0-255)\\
tempo &number The music tempo (50-200) (default: 100)\\
+ speech\_volume &number The speech volume setting (0-255)\\
\\
copy\_protection&bool Enable copy protection in SCUMM games ,when\\
& ScummVM disables it by default.\\
@@ -122,12 +123,10 @@ Broken Sword II adds the following non-standard keywords:\\
reverse\_stereo &bool &If true, stereo channels are reversed\\
sfx\_mute &bool &If true, sound effects are muted\\
speech\_mute &bool &If true, speech is muted\\
- speech\_volume &number &The speech volume setting (0-255)\\
\end{tabular}
Flight of the Amazon Queen adds the following non-standard keywords:\\
\begin{tabular}[h]{lll}
- alt\_intro &bool &Use alternative version of introduction\\
music\_mute &bool &If true, music is muted\\
sfx\_mute &bool &If true, sound effects are muted\\
speech\_mute &bool &If true, speech is muted\\
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;
};
diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp
index e58fa6d270..e7abb544c0 100644
--- a/scumm/dialogs.cpp
+++ b/scumm/dialogs.cpp
@@ -470,13 +470,13 @@ void ConfigDialog::close() {
int soundVolumeMaster = ConfMan.getInt("master_volume");
int soundVolumeMusic = ConfMan.getInt("music_volume");
int soundVolumeSfx = ConfMan.getInt("sfx_volume");
- int soundVolumeVoice = ConfMan.getInt("voice_volume");
+ int soundVolumeSpeech = ConfMan.getInt("speech_volume");
if (_vm->_imuseDigital) {
_vm->_mixer->setVolume(soundVolumeMaster);
_vm->_imuseDigital->setGroupMusicVolume(soundVolumeMusic / 2);
_vm->_imuseDigital->setGroupSfxVolume(soundVolumeSfx / 2);
- _vm->_imuseDigital->setGroupVoiceVolume(soundVolumeVoice / 2);
+ _vm->_imuseDigital->setGroupVoiceVolume(soundVolumeSpeech / 2);
return;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-30 15:39:57 +0000