No longer include remote voices in tts extension manifest
BUG=None
TEST=Manual.
Change-Id: I54a4a9d07baeccbf2a1da420300da1288926c257
Reviewed-on: https://chromium-review.googlesource.com/1292233
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: David Tseng <dtseng@chromium.org>
Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Reviewed-by: David Tseng <dtseng@chromium.org>
diff --git a/speech_synthesis/patts/manifest.json b/speech_synthesis/patts/manifest.json
index 7ced938..52104ca 100644
--- a/speech_synthesis/patts/manifest.json
+++ b/speech_synthesis/patts/manifest.json
@@ -10,384 +10,104 @@
"tts_engine": {
"voices": [
{
- "lang": "en-GB",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS UK English"
- },
- {
- "lang": "en-GB",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS UK English 2"
- },
- {
"lang": "en-US",
+ "voice_name": "Chrome OS US English",
"event_types": [
"start",
"word",
"end",
"error"
- ],
- "voice_name": "Chrome OS US English"
+ ]
},
{
"lang": "de-DE",
+ "voice_name": "Chrome OS Deutsch",
"event_types": [
"start",
"word",
"end",
"error"
- ],
- "voice_name": "Chrome OS Deutsch"
+ ]
},
{
"lang": "pt-BR",
+ "voice_name": "Chrome OS portugu\u00eas do Brasil",
"event_types": [
"start",
"word",
"end",
"error"
- ],
- "voice_name": "Chrome OS portugu\u00eas do Brasil"
+ ]
},
{
"lang": "es-ES",
+ "voice_name": "Chrome OS espa\u00f1ol",
"event_types": [
"start",
"word",
"end",
"error"
- ],
- "voice_name": "Chrome OS espa\u00f1ol"
- },
- {
- "lang": "es-US",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS espa\u00f1ol de Estados Unidos"
+ ]
},
{
"lang": "fr-FR",
+ "voice_name": "Chrome OS fran\u00e7ais",
"event_types": [
"start",
"word",
"end",
"error"
- ],
- "voice_name": "Chrome OS fran\u00e7ais"
+ ]
},
{
"lang": "it-IT",
+ "voice_name": "Chrome OS italiano",
"event_types": [
"start",
"word",
"end",
"error"
- ],
- "voice_name": "Chrome OS italiano"
+ ]
},
{
"lang": "ko-KR",
+ "voice_name": "Chrome OS \ud55c\uad6d\uc758",
"event_types": [
"start",
"word",
"end",
"error"
- ],
- "voice_name": "Chrome OS \ud55c\uad6d\uc758"
- },
- {
- "lang": "en-IN",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS Indian English"
+ ]
},
{
"lang": "nl-NL",
+ "voice_name": "Chrome OS Nederlands",
"event_types": [
"start",
"word",
"end",
"error"
- ],
- "voice_name": "Chrome OS Nederlands"
- },
- {
- "lang": "pl-PL",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS Polski"
- },
- {
- "lang": "ru-RU",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS \u0440\u0443\u0441\u0441\u043a\u0438\u0439"
- },
- {
- "lang": "ja-JP",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS \u65e5\u672c\u8a9e"
+ ]
},
{
"lang": "id-ID",
+ "voice_name": "Chrome OS \u0939\u093f\u0928\u094d\u0926\u0940",
"event_types": [
"start",
"word",
"end",
"error"
- ],
- "voice_name": "Chrome OS \u0939\u093f\u0928\u094d\u0926\u0940"
+ ]
},
{
"lang": "hi-IN",
+ "voice_name": "Chrome OS Bahasa Indonesia",
"event_types": [
"start",
"word",
"end",
"error"
- ],
- "voice_name": "Chrome OS Bahasa Indonesia"
- },
- {
- "lang": "tr-TR",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS T\u00fcrk\u00e7e"
- },
- {
- "lang": "th-TH",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS \u0e44\u0e17\u0e22"
- },
- {
- "lang": "yue-HK",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS \u7cb5\u8a9e"
- },
- {
- "lang": "zh-CN",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS \u666e\u901a\u8bdd"
- },
- {
- "lang": "da-DK",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS Dansk"
- },
- {
- "lang": "nb-NO",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS Norsk Bokm\u00e5l"
- },
- {
- "lang": "zh-TW",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS \u570b\u8a9e"
- },
- {
- "lang": "hu-HU",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS Magyar"
- },
- {
- "lang": "fi-FI",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS Suomi"
- },
- {
- "lang": "bn-BD",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS \u09ac\u09be\u0982\u09b2\u09be"
- },
- {
- "lang": "en-AU",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS Australian English"
- },
- {
- "lang": "vi-VN",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS Ti\u1ebfng Vi\u1ec7t"
- },
- {
- "lang": "sv-SE",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS Svenska"
- },
- {
- "lang": "cs-CZ",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS \u010de\u0161tina"
- },
- {
- "lang": "km-KH",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS \u1781\u17d2\u1798\u17c2\u179a"
- },
- {
- "lang": "si-LK",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS \u0dc3\u0dd2\u0d82\u0dc4\u0dbd"
- },
- {
- "lang": "uk-UA",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS \u0443\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430"
- },
- {
- "lang": "ne-NP",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS \u0928\u0947\u092a\u093e\u0932\u0940"
- },
- {
- "lang": "el-GR",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS \u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac"
- },
- {
- "lang": "fil-PH",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS Filipino"
- },
- {
- "lang": "sk-SK",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS Sloven\u010dina"
+ ]
}
]
},
diff --git a/speech_synthesis/patts/manifest_guest.json b/speech_synthesis/patts/manifest_guest.json
index f144719..8f226a8 100644
--- a/speech_synthesis/patts/manifest_guest.json
+++ b/speech_synthesis/patts/manifest_guest.json
@@ -11,384 +11,104 @@
"tts_engine": {
"voices": [
{
- "lang": "en-GB",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS UK English"
- },
- {
- "lang": "en-GB",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS UK English 2"
- },
- {
"lang": "en-US",
+ "voice_name": "Chrome OS US English",
"event_types": [
"start",
"word",
"end",
"error"
- ],
- "voice_name": "Chrome OS US English"
+ ]
},
{
"lang": "de-DE",
+ "voice_name": "Chrome OS Deutsch",
"event_types": [
"start",
"word",
"end",
"error"
- ],
- "voice_name": "Chrome OS Deutsch"
+ ]
},
{
"lang": "pt-BR",
+ "voice_name": "Chrome OS portugu\u00eas do Brasil",
"event_types": [
"start",
"word",
"end",
"error"
- ],
- "voice_name": "Chrome OS portugu\u00eas do Brasil"
+ ]
},
{
"lang": "es-ES",
+ "voice_name": "Chrome OS espa\u00f1ol",
"event_types": [
"start",
"word",
"end",
"error"
- ],
- "voice_name": "Chrome OS espa\u00f1ol"
- },
- {
- "lang": "es-US",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS espa\u00f1ol de Estados Unidos"
+ ]
},
{
"lang": "fr-FR",
+ "voice_name": "Chrome OS fran\u00e7ais",
"event_types": [
"start",
"word",
"end",
"error"
- ],
- "voice_name": "Chrome OS fran\u00e7ais"
+ ]
},
{
"lang": "it-IT",
+ "voice_name": "Chrome OS italiano",
"event_types": [
"start",
"word",
"end",
"error"
- ],
- "voice_name": "Chrome OS italiano"
+ ]
},
{
"lang": "ko-KR",
+ "voice_name": "Chrome OS \ud55c\uad6d\uc758",
"event_types": [
"start",
"word",
"end",
"error"
- ],
- "voice_name": "Chrome OS \ud55c\uad6d\uc758"
- },
- {
- "lang": "en-IN",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS Indian English"
+ ]
},
{
"lang": "nl-NL",
+ "voice_name": "Chrome OS Nederlands",
"event_types": [
"start",
"word",
"end",
"error"
- ],
- "voice_name": "Chrome OS Nederlands"
- },
- {
- "lang": "pl-PL",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS Polski"
- },
- {
- "lang": "ru-RU",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS \u0440\u0443\u0441\u0441\u043a\u0438\u0439"
- },
- {
- "lang": "ja-JP",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS \u65e5\u672c\u8a9e"
+ ]
},
{
"lang": "id-ID",
+ "voice_name": "Chrome OS \u0939\u093f\u0928\u094d\u0926\u0940",
"event_types": [
"start",
"word",
"end",
"error"
- ],
- "voice_name": "Chrome OS \u0939\u093f\u0928\u094d\u0926\u0940"
+ ]
},
{
"lang": "hi-IN",
+ "voice_name": "Chrome OS Bahasa Indonesia",
"event_types": [
"start",
"word",
"end",
"error"
- ],
- "voice_name": "Chrome OS Bahasa Indonesia"
- },
- {
- "lang": "tr-TR",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS T\u00fcrk\u00e7e"
- },
- {
- "lang": "th-TH",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS \u0e44\u0e17\u0e22"
- },
- {
- "lang": "yue-HK",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS \u7cb5\u8a9e"
- },
- {
- "lang": "zh-CN",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS \u666e\u901a\u8bdd"
- },
- {
- "lang": "da-DK",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS Dansk"
- },
- {
- "lang": "nb-NO",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS Norsk Bokm\u00e5l"
- },
- {
- "lang": "zh-TW",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS \u570b\u8a9e"
- },
- {
- "lang": "hu-HU",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS Magyar"
- },
- {
- "lang": "fi-FI",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS Suomi"
- },
- {
- "lang": "bn-BD",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS \u09ac\u09be\u0982\u09b2\u09be"
- },
- {
- "lang": "en-AU",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS Australian English"
- },
- {
- "lang": "vi-VN",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS Ti\u1ebfng Vi\u1ec7t"
- },
- {
- "lang": "sv-SE",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS Svenska"
- },
- {
- "lang": "cs-CZ",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS \u010de\u0161tina"
- },
- {
- "lang": "km-KH",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS \u1781\u17d2\u1798\u17c2\u179a"
- },
- {
- "lang": "si-LK",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS \u0dc3\u0dd2\u0d82\u0dc4\u0dbd"
- },
- {
- "lang": "uk-UA",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS \u0443\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430"
- },
- {
- "lang": "ne-NP",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS \u0928\u0947\u092a\u093e\u0932\u0940"
- },
- {
- "lang": "el-GR",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS \u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac"
- },
- {
- "lang": "fil-PH",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS Filipino"
- },
- {
- "lang": "sk-SK",
- "event_types": [
- "start",
- "word",
- "end",
- "error"
- ],
- "voice_name": "Chrome OS Sloven\u010dina"
+ ]
}
]
},
diff --git a/speech_synthesis/patts/remote_voice_lstm_bn-BD.js b/speech_synthesis/patts/remote_voice_lstm_bn-BD.js
index 2da82b6..777fa98 100644
--- a/speech_synthesis/patts/remote_voice_lstm_bn-BD.js
+++ b/speech_synthesis/patts/remote_voice_lstm_bn-BD.js
@@ -22,6 +22,7 @@
'cacheToDisk': true,
'lang': 'bn-BD',
'displayName': 'Bangla',
+ 'voiceName': 'Chrome OS বাংলা',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/remote_voice_lstm_cs-CZ.js b/speech_synthesis/patts/remote_voice_lstm_cs-CZ.js
index fe1f4ff..4bb292d 100644
--- a/speech_synthesis/patts/remote_voice_lstm_cs-CZ.js
+++ b/speech_synthesis/patts/remote_voice_lstm_cs-CZ.js
@@ -22,6 +22,7 @@
'cacheToDisk': true,
'lang': 'cs-CZ',
'displayName': 'Czech',
+ 'voiceName': 'Chrome OS čeština',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/remote_voice_lstm_da-DK.js b/speech_synthesis/patts/remote_voice_lstm_da-DK.js
index 109a89f..eb4d6af 100644
--- a/speech_synthesis/patts/remote_voice_lstm_da-DK.js
+++ b/speech_synthesis/patts/remote_voice_lstm_da-DK.js
@@ -22,6 +22,7 @@
'cacheToDisk': true,
'lang': 'da-DK',
'displayName': 'Danish',
+ 'voiceName': 'Chrome OS Dansk',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/remote_voice_lstm_el-GR.js b/speech_synthesis/patts/remote_voice_lstm_el-GR.js
index b37e030..8f7a206 100644
--- a/speech_synthesis/patts/remote_voice_lstm_el-GR.js
+++ b/speech_synthesis/patts/remote_voice_lstm_el-GR.js
@@ -22,6 +22,7 @@
'cacheToDisk': true,
'lang': 'el-GR',
'displayName': 'Greek',
+ 'voiceName': 'Chrome OS Ελληνικά',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/remote_voice_lstm_en-AU.js b/speech_synthesis/patts/remote_voice_lstm_en-AU.js
index ad08416..2ad2fe8 100644
--- a/speech_synthesis/patts/remote_voice_lstm_en-AU.js
+++ b/speech_synthesis/patts/remote_voice_lstm_en-AU.js
@@ -22,6 +22,7 @@
'cacheToDisk': true,
'lang': 'en-AU',
'displayName': 'English (Australia)',
+ 'voiceName': 'Chrome OS Australian English',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/remote_voice_lstm_en-GB.js b/speech_synthesis/patts/remote_voice_lstm_en-GB.js
index 0ee3dca..4e0a03d 100644
--- a/speech_synthesis/patts/remote_voice_lstm_en-GB.js
+++ b/speech_synthesis/patts/remote_voice_lstm_en-GB.js
@@ -22,6 +22,7 @@
'cacheToDisk': true,
'lang': 'en-GB',
'displayName': 'English (Great Britain)',
+ 'voiceName': 'Chrome OS UK English',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/remote_voice_lstm_en-GB2.js b/speech_synthesis/patts/remote_voice_lstm_en-GB2.js
index f37db45..a388a3e 100644
--- a/speech_synthesis/patts/remote_voice_lstm_en-GB2.js
+++ b/speech_synthesis/patts/remote_voice_lstm_en-GB2.js
@@ -22,6 +22,7 @@
'cacheToDisk': true,
'lang': 'en-GB',
'displayName': 'English (Great Britain)',
+ 'voiceName': 'Chrome OS UK English 2',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/remote_voice_lstm_en-IN.js b/speech_synthesis/patts/remote_voice_lstm_en-IN.js
index ffa7f95..5a0f928 100644
--- a/speech_synthesis/patts/remote_voice_lstm_en-IN.js
+++ b/speech_synthesis/patts/remote_voice_lstm_en-IN.js
@@ -22,6 +22,7 @@
'cacheToDisk': true,
'lang': 'en-IN',
'displayName': 'English (India)',
+ 'voiceName': 'Chrome OS Indian English',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/remote_voice_lstm_es-US.js b/speech_synthesis/patts/remote_voice_lstm_es-US.js
index d3ab06d..6d74962 100644
--- a/speech_synthesis/patts/remote_voice_lstm_es-US.js
+++ b/speech_synthesis/patts/remote_voice_lstm_es-US.js
@@ -22,6 +22,7 @@
'cacheToDisk': true,
'lang': 'es-US',
'displayName': 'Spanish (United States)',
+ 'voiceName': 'Chrome OS español de Estados Unidos',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/remote_voice_lstm_fi-FI.js b/speech_synthesis/patts/remote_voice_lstm_fi-FI.js
index efdd422..23f3f6a 100644
--- a/speech_synthesis/patts/remote_voice_lstm_fi-FI.js
+++ b/speech_synthesis/patts/remote_voice_lstm_fi-FI.js
@@ -22,6 +22,7 @@
'cacheToDisk': true,
'lang': 'fi-FI',
'displayName': 'Finnish',
+ 'voiceName': 'Chrome OS Suomi',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/remote_voice_lstm_fil-PH.js b/speech_synthesis/patts/remote_voice_lstm_fil-PH.js
index e177ce1..e45b517 100644
--- a/speech_synthesis/patts/remote_voice_lstm_fil-PH.js
+++ b/speech_synthesis/patts/remote_voice_lstm_fil-PH.js
@@ -22,6 +22,7 @@
'cacheToDisk': true,
'lang': 'fil-PH',
'displayName': 'Filipino',
+ 'voiceName': 'Chrome OS Filipino',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/remote_voice_lstm_hu-HU.js b/speech_synthesis/patts/remote_voice_lstm_hu-HU.js
index 61cc00d..feef554 100644
--- a/speech_synthesis/patts/remote_voice_lstm_hu-HU.js
+++ b/speech_synthesis/patts/remote_voice_lstm_hu-HU.js
@@ -22,6 +22,7 @@
'cacheToDisk': true,
'lang': 'hu-HU',
'displayName': 'Hungarian',
+ 'voiceName': 'Chrome OS Magyar',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/remote_voice_lstm_ja-JP.js b/speech_synthesis/patts/remote_voice_lstm_ja-JP.js
index f113044..715ca74 100644
--- a/speech_synthesis/patts/remote_voice_lstm_ja-JP.js
+++ b/speech_synthesis/patts/remote_voice_lstm_ja-JP.js
@@ -22,6 +22,7 @@
'cacheToDisk': true,
'lang': 'ja-JP',
'displayName': 'Japanese',
+ 'voiceName': 'Chrome OS 日本語',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/remote_voice_lstm_km-KH.js b/speech_synthesis/patts/remote_voice_lstm_km-KH.js
index 813d502..dde6a1a 100644
--- a/speech_synthesis/patts/remote_voice_lstm_km-KH.js
+++ b/speech_synthesis/patts/remote_voice_lstm_km-KH.js
@@ -22,6 +22,7 @@
'cacheToDisk': true,
'lang': 'km-KH',
'displayName': 'Khmer',
+ 'voiceName': 'Chrome OS ខ្មែរ',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/remote_voice_lstm_nb-NO.js b/speech_synthesis/patts/remote_voice_lstm_nb-NO.js
index b969aa7..dd4ee8e 100644
--- a/speech_synthesis/patts/remote_voice_lstm_nb-NO.js
+++ b/speech_synthesis/patts/remote_voice_lstm_nb-NO.js
@@ -22,6 +22,7 @@
'cacheToDisk': true,
'lang': 'nb-NO',
'displayName': 'Norwegian Bokm\u00E5l',
+ 'voiceName': 'Chrome OS Norsk Bokmål',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/remote_voice_lstm_ne-NP.js b/speech_synthesis/patts/remote_voice_lstm_ne-NP.js
index d4b47be..bb6aa30 100644
--- a/speech_synthesis/patts/remote_voice_lstm_ne-NP.js
+++ b/speech_synthesis/patts/remote_voice_lstm_ne-NP.js
@@ -22,6 +22,7 @@
'cacheToDisk': true,
'lang': 'ne-NP',
'displayName': 'Nepali',
+ 'voiceName': 'Chrome OS नेपाली',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/remote_voice_lstm_pl-PL.js b/speech_synthesis/patts/remote_voice_lstm_pl-PL.js
index 925feb4..72e2473 100644
--- a/speech_synthesis/patts/remote_voice_lstm_pl-PL.js
+++ b/speech_synthesis/patts/remote_voice_lstm_pl-PL.js
@@ -22,6 +22,7 @@
'cacheToDisk': true,
'lang': 'pl-PL',
'displayName': 'Polish',
+ 'voiceName': 'Chrome OS Polski',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/remote_voice_lstm_ru-RU.js b/speech_synthesis/patts/remote_voice_lstm_ru-RU.js
index 369c037..56025de 100644
--- a/speech_synthesis/patts/remote_voice_lstm_ru-RU.js
+++ b/speech_synthesis/patts/remote_voice_lstm_ru-RU.js
@@ -22,6 +22,7 @@
'cacheToDisk': true,
'lang': 'ru-RU',
'displayName': 'Russian',
+ 'voiceName': 'Chrome OS русский',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/remote_voice_lstm_si-LK.js b/speech_synthesis/patts/remote_voice_lstm_si-LK.js
index b890e21..f25bef2 100644
--- a/speech_synthesis/patts/remote_voice_lstm_si-LK.js
+++ b/speech_synthesis/patts/remote_voice_lstm_si-LK.js
@@ -22,6 +22,7 @@
'cacheToDisk': true,
'lang': 'si-LK',
'displayName': 'Sinhala',
+ 'voiceName': 'Chrome OS සිංහල',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/remote_voice_lstm_sk-SK.js b/speech_synthesis/patts/remote_voice_lstm_sk-SK.js
index 10723ce..746445f 100644
--- a/speech_synthesis/patts/remote_voice_lstm_sk-SK.js
+++ b/speech_synthesis/patts/remote_voice_lstm_sk-SK.js
@@ -22,6 +22,7 @@
'cacheToDisk': true,
'lang': 'sk-SK',
'displayName': 'Slovak',
+ 'voiceName': 'Chrome OS Slovenčina',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/remote_voice_lstm_sv-SE.js b/speech_synthesis/patts/remote_voice_lstm_sv-SE.js
index f044853..acfd238 100644
--- a/speech_synthesis/patts/remote_voice_lstm_sv-SE.js
+++ b/speech_synthesis/patts/remote_voice_lstm_sv-SE.js
@@ -22,6 +22,7 @@
'cacheToDisk': true,
'lang': 'sv-SE',
'displayName': 'Swedish',
+ 'voiceName': 'Chrome OS Svenska',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/remote_voice_lstm_th-TH.js b/speech_synthesis/patts/remote_voice_lstm_th-TH.js
index e1cda3d..90a9ae4 100644
--- a/speech_synthesis/patts/remote_voice_lstm_th-TH.js
+++ b/speech_synthesis/patts/remote_voice_lstm_th-TH.js
@@ -22,6 +22,7 @@
'cacheToDisk': true,
'lang': 'th-TH',
'displayName': 'Thai',
+ 'voiceName': 'Chrome OS ไทย',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/remote_voice_lstm_tr-TR.js b/speech_synthesis/patts/remote_voice_lstm_tr-TR.js
index 012f81e..ed14778 100644
--- a/speech_synthesis/patts/remote_voice_lstm_tr-TR.js
+++ b/speech_synthesis/patts/remote_voice_lstm_tr-TR.js
@@ -22,6 +22,7 @@
'cacheToDisk': true,
'lang': 'tr-TR',
'displayName': 'Turkish',
+ 'voiceName': 'Chrome OS Türkçe',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/remote_voice_lstm_uk-UA.js b/speech_synthesis/patts/remote_voice_lstm_uk-UA.js
index cb998fc..b3dbb0d 100644
--- a/speech_synthesis/patts/remote_voice_lstm_uk-UA.js
+++ b/speech_synthesis/patts/remote_voice_lstm_uk-UA.js
@@ -22,6 +22,7 @@
'cacheToDisk': true,
'lang': 'uk-UA',
'displayName': 'Ukrainian',
+ 'voiceName': 'Chrome OS українська',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/remote_voice_lstm_vi-VN.js b/speech_synthesis/patts/remote_voice_lstm_vi-VN.js
index 31cc825..71f81f3 100644
--- a/speech_synthesis/patts/remote_voice_lstm_vi-VN.js
+++ b/speech_synthesis/patts/remote_voice_lstm_vi-VN.js
@@ -22,6 +22,7 @@
'cacheToDisk': true,
'lang': 'vi-VN',
'displayName': 'Vietnamese',
+ 'voiceName': 'Chrome OS Tiếng Việt',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/remote_voice_lstm_yue-HK.js b/speech_synthesis/patts/remote_voice_lstm_yue-HK.js
index 7f57355..8ec9b02 100644
--- a/speech_synthesis/patts/remote_voice_lstm_yue-HK.js
+++ b/speech_synthesis/patts/remote_voice_lstm_yue-HK.js
@@ -22,6 +22,7 @@
'cacheToDisk': true,
'lang': 'yue-HK',
'displayName': 'Cantonese',
+ 'voiceName': 'Chrome OS 粵語',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/remote_voice_lstm_zh-CN.js b/speech_synthesis/patts/remote_voice_lstm_zh-CN.js
index 4210265..413182b 100644
--- a/speech_synthesis/patts/remote_voice_lstm_zh-CN.js
+++ b/speech_synthesis/patts/remote_voice_lstm_zh-CN.js
@@ -22,6 +22,7 @@
'cacheToDisk': true,
'lang': 'zh-CN',
'displayName': 'Chinese (China)',
+ 'voiceName': 'Chrome OS 普通话',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/remote_voice_lstm_zh-TW.js b/speech_synthesis/patts/remote_voice_lstm_zh-TW.js
index f7b6136..7be01be 100644
--- a/speech_synthesis/patts/remote_voice_lstm_zh-TW.js
+++ b/speech_synthesis/patts/remote_voice_lstm_zh-TW.js
@@ -22,6 +22,7 @@
'cacheToDisk': true,
'lang': 'zh-TW',
'displayName': 'Chinese (Taiwan)',
+ 'voiceName': 'Chrome OS 國語',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/tts_controller.js b/speech_synthesis/patts/tts_controller.js
index 0d87572..6bd3900 100644
--- a/speech_synthesis/patts/tts_controller.js
+++ b/speech_synthesis/patts/tts_controller.js
@@ -635,37 +635,30 @@
var reader = fs.root.createReader();
reader.readEntries((results) => {
this.rootDirectory_ = results;
- var unloadedVoiceNames = {};
+ var loadedVoices = [];
window.voices.forEach((voice) => {
var unloaded = voice.cacheToDisk &&
!results.find(
(result) => voice.files.find(
(file) => file.path == result.fullPath));
- // Cache this voice by its voiceName for faster lookup below.
- unloadedVoiceNames[voice.voiceName] = unloaded;
-
// Set the load state for other uses.
voice.unloaded = unloaded;
+ if (!unloaded)
+ loadedVoices.push(voice);
});
// Update tts system with only loaded voices.
- var loadedVoicesFromManifest =
- chrome.runtime.getManifest().tts_engine.voices.filter((voice) => {
- return !unloadedVoiceNames[voice['voice_name']];
- });
-
- // Manifest voice format uses snake case, but js runtime expects
- // cammal.
- loadedVoicesFromManifest = loadedVoicesFromManifest.map((voice) => {
+ var protoVoice = chrome.runtime.getManifest().tts_engine.voices[0];
+ loadedVoices = loadedVoices.map((voice) => {
var newVoice = {};
- newVoice['voiceName'] = voice['voice_name'];
- newVoice['eventTypes'] = voice['event_types'];
- newVoice['lang'] = voice['lang'];
+ newVoice['voiceName'] = voice.voiceName;
+ newVoice['eventTypes'] = protoVoice['event_types'];
+ newVoice['lang'] = voice.lang;
return newVoice;
});
- chrome.ttsEngine.updateVoices(loadedVoicesFromManifest);
+ chrome.ttsEngine.updateVoices(loadedVoices);
if (callback)
callback();
});
diff --git a/speech_synthesis/patts/tts_main.js b/speech_synthesis/patts/tts_main.js
index 6062849..14e3fd9 100644
--- a/speech_synthesis/patts/tts_main.js
+++ b/speech_synthesis/patts/tts_main.js
@@ -48,7 +48,6 @@
*/
TtsMain.prototype.run = function() {
document.addEventListener('unload', this.unload, false);
- this.getVoiceNamesFromManifest_();
this.currentController_ = new TtsController('lstm', this, navigator.language);
this.currentController_.updateVoices();
chrome.ttsEngine.onSpeak.addListener(this.onSpeak.bind(this));
@@ -56,24 +55,6 @@
};
/**
- * Gets the voice list from the extension manifest and updates
- * window.voices accordingly.
- * Matching is done by language.
- *
- * @private
- */
-TtsMain.prototype.getVoiceNamesFromManifest_ = function() {
- var manifestVoices = chrome.runtime.getManifest().tts_engine.voices;
- var langMap = {};
- for (var i = 0, voice; voice = manifestVoices[i]; i++) {
- langMap[voice.lang] = voice.voice_name;
- }
- for (var i = 0, voice; voice = window.voices[i]; i++) {
- voice.voiceName = langMap[voice.lang];
- }
-};
-
-/**
* Called by one of the TTS controllers when it finishes its initialization.
*/
TtsMain.prototype.onInitialized = function() {
diff --git a/speech_synthesis/patts/voice_lstm_de-DE.js b/speech_synthesis/patts/voice_lstm_de-DE.js
index fc899de..5b6f98b 100644
--- a/speech_synthesis/patts/voice_lstm_de-DE.js
+++ b/speech_synthesis/patts/voice_lstm_de-DE.js
@@ -22,6 +22,7 @@
'cacheToDisk': false,
'lang': 'de-DE',
'displayName': 'German',
+ 'voiceName': 'Chrome OS Deutsch',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/voice_lstm_en-US.js b/speech_synthesis/patts/voice_lstm_en-US.js
index 0b8eb09..2a8d8ef 100644
--- a/speech_synthesis/patts/voice_lstm_en-US.js
+++ b/speech_synthesis/patts/voice_lstm_en-US.js
@@ -22,6 +22,7 @@
'cacheToDisk': false,
'lang': 'en-US',
'displayName': 'English (United States)',
+ 'voiceName': 'Chrome OS US English',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/voice_lstm_es-ES.js b/speech_synthesis/patts/voice_lstm_es-ES.js
index 4bee805..76f0de1 100644
--- a/speech_synthesis/patts/voice_lstm_es-ES.js
+++ b/speech_synthesis/patts/voice_lstm_es-ES.js
@@ -22,6 +22,7 @@
'cacheToDisk': false,
'lang': 'es-ES',
'displayName': 'Spanish (Spain)',
+ 'voiceName': 'Chrome OS español',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/voice_lstm_fr-FR.js b/speech_synthesis/patts/voice_lstm_fr-FR.js
index 19cb3e3..1fbc891 100644
--- a/speech_synthesis/patts/voice_lstm_fr-FR.js
+++ b/speech_synthesis/patts/voice_lstm_fr-FR.js
@@ -22,6 +22,7 @@
'cacheToDisk': false,
'lang': 'fr-FR',
'displayName': 'French',
+ 'voiceName': 'Chrome OS français',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/voice_lstm_hi-IN.js b/speech_synthesis/patts/voice_lstm_hi-IN.js
index d5b21d9..1942ee8 100644
--- a/speech_synthesis/patts/voice_lstm_hi-IN.js
+++ b/speech_synthesis/patts/voice_lstm_hi-IN.js
@@ -22,6 +22,7 @@
'cacheToDisk': false,
'lang': 'hi-IN',
'displayName': 'Hindi',
+ 'voiceName': 'Chrome OS Bahasa Indonesia',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/voice_lstm_id-ID.js b/speech_synthesis/patts/voice_lstm_id-ID.js
index a0c6c62..bd23733 100644
--- a/speech_synthesis/patts/voice_lstm_id-ID.js
+++ b/speech_synthesis/patts/voice_lstm_id-ID.js
@@ -22,6 +22,7 @@
'cacheToDisk': false,
'lang': 'id-ID',
'displayName': 'Indonesian',
+ 'voiceName': 'Chrome OS हिन्दी',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/voice_lstm_it-IT.js b/speech_synthesis/patts/voice_lstm_it-IT.js
index 391a2b1..e89f6fb 100644
--- a/speech_synthesis/patts/voice_lstm_it-IT.js
+++ b/speech_synthesis/patts/voice_lstm_it-IT.js
@@ -22,6 +22,7 @@
'cacheToDisk': false,
'lang': 'it-IT',
'displayName': 'Italian',
+ 'voiceName': 'Chrome OS italiano',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/voice_lstm_ko-KR.js b/speech_synthesis/patts/voice_lstm_ko-KR.js
index 8d2ede0..989cf14 100644
--- a/speech_synthesis/patts/voice_lstm_ko-KR.js
+++ b/speech_synthesis/patts/voice_lstm_ko-KR.js
@@ -22,6 +22,7 @@
'cacheToDisk': false,
'lang': 'ko-KR',
'displayName': 'Korean',
+ 'voiceName': 'Chrome OS 한국의',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/voice_lstm_nl-NL.js b/speech_synthesis/patts/voice_lstm_nl-NL.js
index 57486fa..e9c0463 100644
--- a/speech_synthesis/patts/voice_lstm_nl-NL.js
+++ b/speech_synthesis/patts/voice_lstm_nl-NL.js
@@ -22,6 +22,7 @@
'cacheToDisk': false,
'lang': 'nl-NL',
'displayName': 'Dutch',
+ 'voiceName': 'Chrome OS Nederlands',
'removePaths': [],
'files': [
{
diff --git a/speech_synthesis/patts/voice_lstm_pt-BR.js b/speech_synthesis/patts/voice_lstm_pt-BR.js
index 1b6f15a..4939fe9 100644
--- a/speech_synthesis/patts/voice_lstm_pt-BR.js
+++ b/speech_synthesis/patts/voice_lstm_pt-BR.js
@@ -22,6 +22,7 @@
'cacheToDisk': false,
'lang': 'pt-BR',
'displayName': 'Portuguese (Brazil)',
+ 'voiceName': 'Chrome OS português do Brasil',
'removePaths': [],
'files': [
{
