summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2012-09-08 20:46:20 +0200
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2012-09-08 20:46:20 +0200
commit9e2eb6243f4aa1fccdb8cdd2abfe7942be91c25c (patch)
tree5309bb6e03b203f42a1c880617ccc078db8a0aca
parent328ff6d979c028ecba9c57d12c1e75637be20396 (diff)
downloadrockbox-9e2eb6243f4aa1fccdb8cdd2abfe7942be91c25c.tar.gz
rockbox-9e2eb6243f4aa1fccdb8cdd2abfe7942be91c25c.zip
Change sapi_voice.vbs voice list separation character.
The currently used comma for separating voices for the /listvoices command is used by Speech Platform based voices. Change the character to a semicolon which isn't used by voices. Change-Id: I1a7e6e4229f864f56635143e864dadf38cdd7e73
-rw-r--r--rbutil/rbutilqt/base/ttssapi.cpp5
-rw-r--r--tools/sapi_voice.vbs2
2 files changed, 5 insertions, 2 deletions
diff --git a/rbutil/rbutilqt/base/ttssapi.cpp b/rbutil/rbutilqt/base/ttssapi.cpp
index f726dcf8da..666b101266 100644
--- a/rbutil/rbutilqt/base/ttssapi.cpp
+++ b/rbutil/rbutilqt/base/ttssapi.cpp
@@ -198,7 +198,10 @@ QStringList TTSSapi::getVoiceList(QString language)
198 voicescript->waitForReadyRead(); 198 voicescript->waitForReadyRead();
199 199
200 QString dataRaw = voicescript->readAllStandardError().data(); 200 QString dataRaw = voicescript->readAllStandardError().data();
201 result = dataRaw.split(",",QString::SkipEmptyParts); 201 if(dataRaw.startsWith("Error")) {
202 qDebug() << "[TTSSapi] Error:" << dataRaw;
203 }
204 result = dataRaw.split(";",QString::SkipEmptyParts);
202 if(result.size() > 0) 205 if(result.size() > 0)
203 { 206 {
204 result.sort(); 207 result.sort();
diff --git a/tools/sapi_voice.vbs b/tools/sapi_voice.vbs
index 6f20109c24..a8b98ac924 100644
--- a/tools/sapi_voice.vbs
+++ b/tools/sapi_voice.vbs
@@ -139,7 +139,7 @@ Else ' SAPI5
139 For Each nLangID in LangIDs(sLanguage) 139 For Each nLangID in LangIDs(sLanguage)
140 sSelectString = "Language=" & Hex(nLangID) 140 sSelectString = "Language=" & Hex(nLangID)
141 For Each oVoice in oSpVoice.GetVoices(sSelectString) 141 For Each oVoice in oSpVoice.GetVoices(sSelectString)
142 WScript.StdErr.Write oVoice.GetAttribute("Name") & "," 142 WScript.StdErr.Write oVoice.GetAttribute("Name") & ";"
143 Next 143 Next
144 Next 144 Next
145 WScript.StdErr.WriteLine 145 WScript.StdErr.WriteLine