diff options
| author | Jaromir Wysoglad | 2019-07-17 13:33:42 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2019-09-01 22:47:55 +0300 |
| commit | 33f8aadfeb81ead60ce1264f0af681dcdbd4931f (patch) | |
| tree | 445cc26d9d425eca0bf42a7c5ae436fb487916cc /backends/text-to-speech/linux | |
| parent | 318c6d7ec6e5562d0fd3e9d70386d0fcde86cf12 (diff) | |
| download | scummvm-rg350-33f8aadfeb81ead60ce1264f0af681dcdbd4931f.tar.gz scummvm-rg350-33f8aadfeb81ead60ce1264f0af681dcdbd4931f.tar.bz2 scummvm-rg350-33f8aadfeb81ead60ce1264f0af681dcdbd4931f.zip | |
TTS: Add age to TTSVoice
Diffstat (limited to 'backends/text-to-speech/linux')
| -rw-r--r-- | backends/text-to-speech/linux/linux-text-to-speech.cpp | 20 | ||||
| -rw-r--r-- | backends/text-to-speech/linux/linux-text-to-speech.h | 2 |
2 files changed, 11 insertions, 11 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 1e92742845..758996dad8 100644 --- a/backends/text-to-speech/linux/linux-text-to-speech.cpp +++ b/backends/text-to-speech/linux/linux-text-to-speech.cpp @@ -199,10 +199,10 @@ void LinuxTextToSpeechManager::setLanguage(Common::String language) { setVoice(_ttsState->_activeVoice); } -void LinuxTextToSpeechManager::createVoice(int typeNumber, Common::TTSVoice::Gender gender, char *description) { +void LinuxTextToSpeechManager::createVoice(int typeNumber, Common::TTSVoice::Gender gender, Common::TTSVoice::Age age, char *description) { SPDVoiceType *type = (SPDVoiceType *) malloc(sizeof(SPDVoiceType)); *type = static_cast<SPDVoiceType>(typeNumber); - _ttsState->_availaibleVoices.push_back(Common::TTSVoice(gender, (void *) type, description)); + _ttsState->_availaibleVoices.push_back(Common::TTSVoice(gender, age, (void *) type, description)); } void LinuxTextToSpeechManager::updateVoices() { @@ -219,14 +219,14 @@ void LinuxTextToSpeechManager::updateVoices() { char **voiceInfo = spd_list_voices(_connection); - createVoice(SPD_MALE1, Common::TTSVoice::MALE, voiceInfo[0]); - createVoice(SPD_MALE2, Common::TTSVoice::MALE, voiceInfo[1]); - createVoice(SPD_MALE3, Common::TTSVoice::MALE, voiceInfo[2]); - createVoice(SPD_FEMALE1, Common::TTSVoice::FEMALE, voiceInfo[3]); - createVoice(SPD_FEMALE2, Common::TTSVoice::FEMALE, voiceInfo[4]); - createVoice(SPD_FEMALE3, Common::TTSVoice::FEMALE, voiceInfo[5]); - createVoice(SPD_CHILD_MALE, Common::TTSVoice::MALE, voiceInfo[6]); - createVoice(SPD_CHILD_FEMALE, Common::TTSVoice::FEMALE, voiceInfo[7]); + createVoice(SPD_MALE1, Common::TTSVoice::MALE, Common::TTSVoice::ADULT, voiceInfo[0]); + createVoice(SPD_MALE2, Common::TTSVoice::MALE, Common::TTSVoice::ADULT, voiceInfo[1]); + createVoice(SPD_MALE3, Common::TTSVoice::MALE, Common::TTSVoice::ADULT, voiceInfo[2]); + createVoice(SPD_FEMALE1, Common::TTSVoice::FEMALE, Common::TTSVoice::ADULT, voiceInfo[3]); + createVoice(SPD_FEMALE2, Common::TTSVoice::FEMALE, Common::TTSVoice::ADULT, voiceInfo[4]); + createVoice(SPD_FEMALE3, Common::TTSVoice::FEMALE, Common::TTSVoice::ADULT, voiceInfo[5]); + createVoice(SPD_CHILD_MALE, Common::TTSVoice::MALE, Common::TTSVoice::CHILD, voiceInfo[6]); + createVoice(SPD_CHILD_FEMALE, Common::TTSVoice::FEMALE, Common::TTSVoice::CHILD, voiceInfo[7]); } 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 cd3fcf6cb3..64c2371b72 100644 --- a/backends/text-to-speech/linux/linux-text-to-speech.h +++ b/backends/text-to-speech/linux/linux-text-to-speech.h @@ -70,7 +70,7 @@ public: private: void init(); virtual void updateVoices(); - void createVoice(int typeNumber, Common::TTSVoice::Gender, char *description); + void createVoice(int typeNumber, Common::TTSVoice::Gender, Common::TTSVoice::Age, char *description); SpeechState _speechState; }; |