aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorJaromir Wysoglad2019-07-16 22:09:05 -0700
committerFilippos Karapetis2019-09-01 22:47:55 +0300
commit318c6d7ec6e5562d0fd3e9d70386d0fcde86cf12 (patch)
treed38d0048557b0fbc0a5ea09fcaf36abf3890cfdd /common
parentd2d34a4ecaabd7d436bfab942c9003d0e478ad2a (diff)
downloadscummvm-rg350-318c6d7ec6e5562d0fd3e9d70386d0fcde86cf12.tar.gz
scummvm-rg350-318c6d7ec6e5562d0fd3e9d70386d0fcde86cf12.tar.bz2
scummvm-rg350-318c6d7ec6e5562d0fd3e9d70386d0fcde86cf12.zip
TTS: Finish implementing the Windows TTS manager
Diffstat (limited to 'common')
-rw-r--r--common/text-to-speech.cpp20
-rw-r--r--common/text-to-speech.h2
2 files changed, 1 insertions, 21 deletions
diff --git a/common/text-to-speech.cpp b/common/text-to-speech.cpp
index 459d4706db..e8e0d9b870 100644
--- a/common/text-to-speech.cpp
+++ b/common/text-to-speech.cpp
@@ -59,25 +59,5 @@ void TextToSpeechManager::pushState() {
updateVoices();
}
-bool TextToSpeechManager::popState() {
- if (_ttsState->_next == nullptr)
- return true;
-
- for (TTSVoice *i = _ttsState->_availaibleVoices.begin(); i < _ttsState->_availaibleVoices.end(); i++) {
- free(i->_data);
- }
-
- TTSState *oldState = _ttsState;
- _ttsState = _ttsState->_next;
-
- delete oldState;
-
- setLanguage(_ttsState->_language);
- setPitch(_ttsState->_pitch);
- setVolume(_ttsState->_volume);
- setRate(_ttsState->_rate);
- return false;
-}
-
}
#endif
diff --git a/common/text-to-speech.h b/common/text-to-speech.h
index 4e66cf23e4..39d49e97b8 100644
--- a/common/text-to-speech.h
+++ b/common/text-to-speech.h
@@ -109,7 +109,7 @@ public:
Array<TTSVoice> getVoicesArray() { return _ttsState->_availaibleVoices; }
void pushState();
- bool popState();
+ virtual bool popState() { return true; }
protected:
TTSState *_ttsState;