TTS: Add age to TTSVoice

6 files changed, 43 insertions, 17 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;
 };
 
diff --git a/backends/text-to-speech/windows/windows-text-to-speech.cpp b/backends/text-to-speech/windows/windows-text-to-speech.cpp
index edadf5e667..6f621ed5d6 100644
--- a/backends/text-to-speech/windows/windows-text-to-speech.cpp
+++ b/backends/text-to-speech/windows/windows-text-to-speech.cpp
@@ -49,6 +49,7 @@ ISpAudio *_audio;
 
 WindowsTextToSpeechManager::WindowsTextToSpeechManager()
 	: _speechState(BROKEN){
+		ConfMan.setInt("tts_voice", 0);
 	init();
 }
 
@@ -268,7 +269,19 @@ void WindowsTextToSpeechManager::createVoice(void *cpVoiceToken) {
 	free(buffer);
 	CoTaskMemFree(data);
 
-	_ttsState->_availaibleVoices.push_back(Common::TTSVoice(gender, (void *) voiceToken, desc));
+	// age
+	hr = key->GetStringValue(L"Age", &data);
+	if (FAILED(hr)) {
+		voiceToken->Release();
+		warning("Could not get the age attribute for voice: %s", desc.c_str());
+		return;
+	}
+	buffer = Win32::unicodeToAnsi(data);
+	Common::TTSVoice::Age age = !strcmp(buffer, "Adult") ? Common::TTSVoice::ADULT : Common::TTSVoice::UNKNOWN_AGE;
+	free(buffer);
+	CoTaskMemFree(data);
+
+	_ttsState->_availaibleVoices.push_back(Common::TTSVoice(gender, Common::TTSVoice::ADULT, (void *) voiceToken, desc));
 }
 
 int strToInt(Common::String str) {
diff --git a/common/text-to-speech.h b/common/text-to-speech.h
index 39d49e97b8..1283dfea5f 100644
--- a/common/text-to-speech.h
+++ b/common/text-to-speech.h
@@ -38,26 +38,37 @@ class TTSVoice {
 		enum Gender {
 			MALE,
 			FEMALE,
-			UNKNOWN
+			UNKNOWN_GENDER
+		};
+
+		enum Age {
+			CHILD,
+			ADULT,
+			UNKNOWN_AGE
 		};
 
 	public:
 		TTSVoice()
-			: _gender(UNKNOWN)
+			: _gender(UNKNOWN_GENDER)
+			, _age(UNKNOWN_AGE)
 			, _data(nullptr)
 			, _description("") {}
-		TTSVoice(Gender gender, void *data, String description) 
+		TTSVoice(Gender gender, Age age, void *data, String description) 
 			: _gender(gender)
+			, _age(age)
 			, _data(data)
 			, _description(description) {}
 		Gender getGender() { return _gender; };
 		void setGender(Gender gender) { _gender = gender; };
+		Age getAge() { return _age; };
+		void setAge(Age age) { _age = age; };
 		void setData(void *data) { _data = data; };
 		void *getData() { return _data; };
 		String getDescription() { return _description; };
 
 	protected:
 		Gender _gender;
+		Age _age;
 		void *_data;
 		String _description;
 };
diff --git a/gui/options.cpp b/gui/options.cpp
index b82bfc6440..507ae34176 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -1808,8 +1808,10 @@ void GlobalOptionsDialog::build() {
 	for(unsigned i = 0; i < voices.size(); i++) {
 		_ttsVoiceSelectionPopUp->appendEntry(voices[i].getDescription(), i);
 	}
+	if (voices.size() == 0)
+		_ttsVoiceSelectionPopUp->appendEntry("None", 0);
 
-	if (ConfMan.hasKey("tts_voice"))
+	if (ConfMan.hasKey("tts_voice") && (unsigned) ConfMan.getInt("tts_voice", _domain) < voices.size())
 		_ttsVoiceSelectionPopUp->setSelectedTag(ConfMan.getInt("tts_voice", _domain)) ;
 	else
 		_ttsVoiceSelectionPopUp->setSelectedTag(0);
diff --git a/gui/widgets/popup.cpp b/gui/widgets/popup.cpp
index 532127a422..2fce6e126f 100644
--- a/gui/widgets/popup.cpp
+++ b/gui/widgets/popup.cpp
@@ -213,7 +213,7 @@ void PopUpDialog::handleMouseMoved(int x, int y, int button) {
 
 	// ...and update the selection accordingly
 	setSelection(item);
-	if (_lastRead != item) {
+	if (_lastRead != item && _popUpBoss->_entries.size() > 0 && item != -1) {
 		read(_popUpBoss->_entries[item].name);
 		_lastRead = item;
 	}