aboutsummaryrefslogtreecommitdiff
path: root/gui/gui-manager.cpp
diff options
context:
space:
mode:
authorJaromir Wysoglad2019-07-23 17:54:31 +0200
committerFilippos Karapetis2019-09-01 22:47:55 +0300
commit58065ceacda18dbae0e72d19ece6438ab06a332b (patch)
tree5a2ff7a8e710e29f7e1d69b49808a26dc659c57e /gui/gui-manager.cpp
parent4ec10ffec786be030a358e1b5499a6b856092e81 (diff)
downloadscummvm-rg350-58065ceacda18dbae0e72d19ece6438ab06a332b.tar.gz
scummvm-rg350-58065ceacda18dbae0e72d19ece6438ab06a332b.tar.bz2
scummvm-rg350-58065ceacda18dbae0e72d19ece6438ab06a332b.zip
TTS: Refactoring
* Delete multiple empty rows * Make getVolume non-virtual and leave just the implementation in base class * Resolve warning about signed / unsigned comparison in gui-manager * Clear availableVoices when updating voices on linux * By default set language to transMan language on windows (if the transMan is available) * Remove freeVoices method from Windows ttsMan, it isn't needed anymore
Diffstat (limited to 'gui/gui-manager.cpp')
-rw-r--r--gui/gui-manager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp
index 9f4af81e42..2541752001 100644
--- a/gui/gui-manager.cpp
+++ b/gui/gui-manager.cpp
@@ -641,7 +641,7 @@ void GuiManager::initTextToSpeech() {
volume = 0;
ttsMan->setVolume(volume);
- int voice;
+ unsigned voice;
if(ConfMan.hasKey("tts_voice"))
voice = ConfMan.getInt("tts_voice", "scummvm");
else