libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-05 01:38:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GUI: Allow selecting the default TTS voice in the Options

Browse Source
This commit is contained in:
Thierry Crozat 2020-06-21 16:01:39 +01:00
parent 75698aa306
commit a362d58821
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gui/gui-manager.cpp
View File

@ -664,12 +664,12 @@ void GuiManager::initTextToSpeech() {
ttsMan->setVolume(volume);
unsigned voice;
if(ConfMan.hasKey("tts_voice"))
if(ConfMan.hasKey("tts_voice")) {
voice = ConfMan.getInt("tts_voice", "scummvm");
else
voice = 0;
if (voice >= ttsMan->getVoicesArray().size())
voice = 0;
if (voice >= ttsMan->getVoicesArray().size())
voice = ttsMan->getDefaultVoice();
} else
voice = ttsMan->getDefaultVoice();
ttsMan->setVoice(voice);
}
#endif

18
gui/options.cpp
View File

@ -2176,16 +2176,18 @@ void GlobalOptionsDialog::addAccessibilityControls(GuiObject *boss, const Common
if (ttsMan != nullptr)
voices = ttsMan->getVoicesArray();
for(unsigned i = 0; i < voices.size(); i++) {
_ttsVoiceSelectionPopUp->appendEntry(voices[i].getDescription(), i);
}
if (voices.empty())
_ttsVoiceSelectionPopUp->appendEntry(_("None"), 0);
else {
_ttsVoiceSelectionPopUp->appendEntry(_("<default>"));
for(unsigned i = 0; i < voices.size(); i++)
_ttsVoiceSelectionPopUp->appendEntry(voices[i].getDescription(), i);
}
if (ConfMan.hasKey("tts_voice") && (unsigned) ConfMan.getInt("tts_voice", _domain) < voices.size())
if (ConfMan.hasKey("tts_voice", _domain) && (unsigned) ConfMan.getInt("tts_voice", _domain) < voices.size())
_ttsVoiceSelectionPopUp->setSelectedTag(ConfMan.getInt("tts_voice", _domain)) ;
else
_ttsVoiceSelectionPopUp->setSelectedTag(0);
_ttsVoiceSelectionPopUp->setSelected(0);
}
#endif
@ -2347,15 +2349,17 @@ void GlobalOptionsDialog::apply() {
else {
ttsMan->setLanguage(newLang);
}
_ttsVoiceSelectionPopUp->setSelectedTag(0);
_ttsVoiceSelectionPopUp->setSelected(0);
}
int volume = (ConfMan.getInt("speech_volume", "scummvm") * 100) / 256;
if (ConfMan.hasKey("mute", "scummvm") && ConfMan.getBool("mute", "scummvm"))
volume = 0;
ttsMan->setVolume(volume);
ConfMan.setBool("tts_enabled", _ttsCheckbox->getState(), _domain);
int selectedVoice = _ttsVoiceSelectionPopUp->getSelectedTag();
unsigned selectedVoice = _ttsVoiceSelectionPopUp->getSelectedTag();
ConfMan.setInt("tts_voice", selectedVoice, _domain);
if (selectedVoice >= ttsMan->getVoicesArray().size())
selectedVoice = ttsMan->getDefaultVoice();
ttsMan->setVoice(selectedVoice);
}
#endif