diff options
| author | Jaromir Wysoglad | 2019-08-02 01:50:59 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2019-09-01 22:47:55 +0300 |
| commit | 4bae32ffe7952ca967b16c8043c1957e9a3379b2 (patch) | |
| tree | e6cc3600965a66dcde468fd7522cf1e47e36ee50 /backends/text-to-speech/linux | |
| parent | 98cea3e2cef3bf4c723967af60dfb961ab4bafaf (diff) | |
| download | scummvm-rg350-4bae32ffe7952ca967b16c8043c1957e9a3379b2.tar.gz scummvm-rg350-4bae32ffe7952ca967b16c8043c1957e9a3379b2.tar.bz2 scummvm-rg350-4bae32ffe7952ca967b16c8043c1957e9a3379b2.zip | |
TTS: Add *_NO_REPEAT actions
Diffstat (limited to 'backends/text-to-speech/linux')
| -rw-r--r-- | backends/text-to-speech/linux/linux-text-to-speech.cpp | 10 | ||||
| -rw-r--r-- | backends/text-to-speech/linux/linux-text-to-speech.h | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/backends/text-to-speech/linux/linux-text-to-speech.cpp b/backends/text-to-speech/linux/linux-text-to-speech.cpp index c63c4c7dc7..97d05a67c1 100644 --- a/backends/text-to-speech/linux/linux-text-to-speech.cpp +++ b/backends/text-to-speech/linux/linux-text-to-speech.cpp @@ -81,6 +81,7 @@ void LinuxTextToSpeechManager::init() { warning("Couldn't initialize text to speech through speech-dispatcher"); return; } + _lastSaid = ""; _connection->callback_begin = speech_begin_callback; spd_set_notification_on(_connection, SPD_BEGIN); @@ -137,6 +138,12 @@ bool LinuxTextToSpeechManager::say(Common::String str, Action action, Common::St if (action == DROP && isSpeaking()) return true; + + if (action == INTERRUPT_NO_REPEAT && _lastSaid == str && isSpeaking()) + return true; + + if (action == QUEUE_NO_REPEAT && _lastSaid == str && isSpeaking()) + return true; if (charset.empty()) { #ifdef USE_TRANSLATION @@ -148,10 +155,11 @@ bool LinuxTextToSpeechManager::say(Common::String str, Action action, Common::St str = strToUtf8(str, charset); - if (isSpeaking() && action == INTERRUPT) + if (isSpeaking() && action == INTERRUPT || action == INTERRUPT_NO_REPEAT) stop(); if (str.size() != 0) _speechState = SPEAKING; + _lastSaid = str; if(spd_say(_connection, SPD_MESSAGE, str.c_str()) == -1) { //restart the connection if (_connection != 0) diff --git a/backends/text-to-speech/linux/linux-text-to-speech.h b/backends/text-to-speech/linux/linux-text-to-speech.h index 49701abb4c..30fa9b878c 100644 --- a/backends/text-to-speech/linux/linux-text-to-speech.h +++ b/backends/text-to-speech/linux/linux-text-to-speech.h @@ -72,6 +72,7 @@ private: void createVoice(int typeNumber, Common::TTSVoice::Gender, Common::TTSVoice::Age, char *description); SpeechState _speechState; Common::String strToUtf8(Common::String str, Common::String charset); + Common::String _lastSaid; }; #endif |