diff options
| author | Jaromir Wysoglad | 2019-07-23 17:54:31 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2019-09-01 22:47:55 +0300 |
| commit | 58065ceacda18dbae0e72d19ece6438ab06a332b (patch) | |
| tree | 5a2ff7a8e710e29f7e1d69b49808a26dc659c57e /gui | |
| parent | 4ec10ffec786be030a358e1b5499a6b856092e81 (diff) | |
| download | scummvm-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')
| -rw-r--r-- | gui/gui-manager.cpp | 2 | ||||
| -rw-r--r-- | gui/gui-manager.h | 1 | ||||
| -rw-r--r-- | gui/options.cpp | 1 | ||||
| -rw-r--r-- | gui/options.h | 1 |
4 files changed, 1 insertions, 4 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 diff --git a/gui/gui-manager.h b/gui/gui-manager.h index 880c94d436..f97d52794a 100644 --- a/gui/gui-manager.h +++ b/gui/gui-manager.h @@ -177,7 +177,6 @@ protected: void giveFocusToDialog(Dialog *dialog); void setLastMousePos(int16 x, int16 y); - }; } // End of namespace GUI diff --git a/gui/options.cpp b/gui/options.cpp index 507ae34176..68053dd4bc 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -426,7 +426,6 @@ void OptionsDialog::build() { _subSpeedSlider->setValue(speed); _subSpeedLabel->setValue(speed); } - } void OptionsDialog::clean() { diff --git a/gui/options.h b/gui/options.h index 76ad4ef082..559ecbecde 100644 --- a/gui/options.h +++ b/gui/options.h @@ -223,7 +223,6 @@ private: CheckboxWidget *_muteCheckbox; - protected: // // Game GUI options |