From 9f232ab5ec3716d51196f03a5c6b1def705809bb Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Sun, 25 Sep 2022 14:41:19 +0200 Subject: [PATCH 1/2] #ATIS - added Google TTS option --- Moose Development/Moose/Ops/ATIS.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Moose Development/Moose/Ops/ATIS.lua b/Moose Development/Moose/Ops/ATIS.lua index 867404df2..591129617 100644 --- a/Moose Development/Moose/Ops/ATIS.lua +++ b/Moose Development/Moose/Ops/ATIS.lua @@ -1126,8 +1126,9 @@ end -- @param #string Culture Culture, e.g. "en-GB" (default). -- @param #string Voice Specific voice. Overrides `Gender` and `Culture`. -- @param #number Port SRS port. Default 5002. +-- @param #string GoogleKey Path to Google JSON-Key. -- @return #ATIS self -function ATIS:SetSRS(PathToSRS, Gender, Culture, Voice, Port) +function ATIS:SetSRS(PathToSRS, Gender, Culture, Voice, Port, GoogleKey) if PathToSRS then self.useSRS=true self.msrs=MSRS:New(PathToSRS, self.frequency, self.modulation) @@ -1137,6 +1138,7 @@ function ATIS:SetSRS(PathToSRS, Gender, Culture, Voice, Port) self.msrs:SetPort(Port) self.msrs:SetCoalition(self:GetCoalition()) self.msrs:SetLabel("ATIS") + self.msrs:SetGoogle(GoogleKey) self.msrsQ = MSRSQUEUE:New("ATIS") if self.dTQueueCheck<=10 then self:SetQueueUpdateTime(90) From 9eb82060a51f50d57ffc371afab92f6172cffc64 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Sun, 25 Sep 2022 14:41:38 +0200 Subject: [PATCH 2/2] SRS - corrected enumerator --- Moose Development/Moose/Sound/SRS.lua | 166 +++++++++++++------------- 1 file changed, 83 insertions(+), 83 deletions(-) diff --git a/Moose Development/Moose/Sound/SRS.lua b/Moose Development/Moose/Sound/SRS.lua index 9ed2258bf..bc1bb67dc 100644 --- a/Moose Development/Moose/Sound/SRS.lua +++ b/Moose Development/Moose/Sound/SRS.lua @@ -155,91 +155,91 @@ MSRS.Voices = { }, Google = { Standard = { - ["en-AU-Standard-A"] = 'en-AU-Standard-A', -- [1] FEMALE - ["en-AU-Standard-B"] = 'en-AU-Standard-B', -- [2] MALE - ["en-AU-Standard-C"] = 'en-AU-Standard-C', -- [3] FEMALE - ["en-AU-Standard-D"] = 'en-AU-Standard-D', -- [4] MALE - ["en-IN-Standard-A"] = 'en-IN-Standard-A', -- [5] FEMALE - ["en-IN-Standard-B"] = 'en-IN-Standard-B', -- [6] MALE - ["en-IN-Standard-C"] = 'en-IN-Standard-C', -- [7] MALE - ["en-IN-Standard-D"] = 'en-IN-Standard-D', -- [8] FEMALE - ["en-GB-Standard-A"] = 'en-GB-Standard-A', -- [9] FEMALE - ["en-GB-Standard-B"] = 'en-GB-Standard-B', -- [10] MALE - ["en-GB-Standard-C"] = 'en-GB-Standard-C', -- [11] FEMALE - ["en-GB-Standard-D"] = 'en-GB-Standard-D', -- [12] MALE - ["en-GB-Standard-F"] = 'en-GB-Standard-F', -- [13] FEMALE - ["en-US-Standard-A"] = 'en-US-Standard-A', -- [14] MALE - ["en-US-Standard-B"] = 'en-US-Standard-B', -- [15] MALE - ["en-US-Standard-C"] = 'en-US-Standard-C', -- [16] FEMALE - ["en-US-Standard-D"] = 'en-US-Standard-D', -- [17] MALE - ["en-US-Standard-E"] = 'en-US-Standard-E', -- [18] FEMALE - ["en-US-Standard-F"] = 'en-US-Standard-F', -- [19] FEMALE - ["en-US-Standard-G"] = 'en-US-Standard-G', -- [20] FEMALE - ["en-US-Standard-H"] = 'en-US-Standard-H', -- [21] FEMALE - ["en-US-Standard-I"] = 'en-US-Standard-I', -- [22] MALE - ["en-US-Standard-J"] = 'en-US-Standard-J', -- [23] MALE - ["fr-FR-Standard-A"] = "fr-FR-Standard-A", -- Female - ["fr-FR-Standard-B"] = "fr-FR-Standard-B", -- Male - ["fr-FR-Standard-C"] = "fr-FR-Standard-C", -- Female - ["fr-FR-Standard-D"] = "fr-FR-Standard-D", -- Male - ["fr-FR-Standard-E"] = "fr-FR-Standard-E", -- Female - ["de-DE-Standard-A"] = "de-DE-Standard-A", -- Female - ["de-DE-Standard-B"] = "de-DE-Standard-B", -- Male - ["de-DE-Standard-C"] = "de-DE-Standard-C", -- Female - ["de-DE-Standard-D"] = "de-DE-Standard-D", -- Male - ["de-DE-Standard-E"] = "de-DE-Standard-E", -- Male - ["de-DE-Standard-F"] = "de-DE-Standard-F", -- Female - ["es-ES-Standard-A"] = "es-ES-Standard-A", -- Female - ["es-ES-Standard-B"] = "es-ES-Standard-B", -- Male - ["es-ES-Standard-C"] = "es-ES-Standard-C", -- Female - ["es-ES-Standard-D"] = "es-ES-Standard-D", -- Female - ["it-IT-Standard-A"] = "it-IT-Standard-A", -- Female - ["it-IT-Standard-B"] = "it-IT-Standard-B", -- Female - ["it-IT-Standard-C"] = "it-IT-Standard-C", -- Male - ["it-IT-Standard-D"] = "it-IT-Standard-D", -- Male + ["en_AU_Standard_A"] = 'en-AU-Standard-A', -- [1] FEMALE + ["en_AU_Standard_B"] = 'en-AU-Standard-B', -- [2] MALE + ["en_AU_Standard_C"] = 'en-AU-Standard-C', -- [3] FEMALE + ["en_AU_Standard_D"] = 'en-AU-Standard-D', -- [4] MALE + ["en_IN_Standard_A"] = 'en-IN-Standard-A', -- [5] FEMALE + ["en_IN_Standard_B"] = 'en-IN-Standard-B', -- [6] MALE + ["en_IN_Standard_C"] = 'en-IN-Standard-C', -- [7] MALE + ["en_IN_Standard_D"] = 'en-IN-Standard-D', -- [8] FEMALE + ["en_GB_Standard_A"] = 'en-GB-Standard-A', -- [9] FEMALE + ["en_GB_Standard_B"] = 'en-GB-Standard-B', -- [10] MALE + ["en_GB_Standard_C"] = 'en-GB-Standard-C', -- [11] FEMALE + ["en_GB_Standard_D"] = 'en-GB-Standard-D', -- [12] MALE + ["en_GB_Standard_F"] = 'en-GB-Standard-F', -- [13] FEMALE + ["en_US_Standard_A"] = 'en-US-Standard-A', -- [14] MALE + ["en_US_Standard_B"] = 'en-US-Standard-B', -- [15] MALE + ["en_US_Standard_C"] = 'en-US-Standard-C', -- [16] FEMALE + ["en_US_Standard_D"] = 'en-US-Standard-D', -- [17] MALE + ["en_US_Standard_E"] = 'en-US-Standard-E', -- [18] FEMALE + ["en_US_Standard_F"] = 'en-US-Standard-F', -- [19] FEMALE + ["en_US_Standard_G"] = 'en-US-Standard-G', -- [20] FEMALE + ["en_US_Standard_H"] = 'en-US-Standard-H', -- [21] FEMALE + ["en_US_Standard_I"] = 'en-US-Standard-I', -- [22] MALE + ["en_US_Standard_J"] = 'en-US-Standard-J', -- [23] MALE + ["fr_FR_Standard_A"] = "fr-FR-Standard-A", -- Female + ["fr_FR_Standard_B"] = "fr-FR-Standard-B", -- Male + ["fr_FR_Standard_C"] = "fr-FR-Standard-C", -- Female + ["fr_FR_Standard_D"] = "fr-FR-Standard-D", -- Male + ["fr_FR_Standard_E"] = "fr-FR-Standard-E", -- Female + ["de_DE_Standard_A"] = "de-DE-Standard-A", -- Female + ["de_DE_Standard_B"] = "de-DE-Standard-B", -- Male + ["de_DE_Standard_C"] = "de-DE-Standard-C", -- Female + ["de_DE_Standard_D"] = "de-DE-Standard-D", -- Male + ["de_DE_Standard_E"] = "de-DE-Standard-E", -- Male + ["de_DE_Standard_F"] = "de-DE-Standard-F", -- Female + ["es_ES_Standard_A"] = "es-ES-Standard-A", -- Female + ["es_ES_Standard_B"] = "es-ES-Standard-B", -- Male + ["es_ES_Standard_C"] = "es-ES-Standard-C", -- Female + ["es_ES_Standard_D"] = "es-ES-Standard-D", -- Female + ["it_IT_Standard_A"] = "it-IT-Standard-A", -- Female + ["it_IT_Standard_B"] = "it-IT-Standard-B", -- Female + ["it_IT_Standard_C"] = "it-IT-Standard-C", -- Male + ["it_IT_Standard_D"] = "it-IT-Standard-D", -- Male }, Wavenet = { - ["en-AU-Wavenet-A"] = 'en-AU-Wavenet-A', -- [1] FEMALE - ["en-AU-Wavenet-B"] = 'en-AU-Wavenet-B', -- [2] MALE - ["en-AU-Wavenet-C"] = 'en-AU-Wavenet-C', -- [3] FEMALE - ["en-AU-Wavenet-D"] = 'en-AU-Wavenet-D', -- [4] MALE - ["en-IN-Wavenet-A"] = 'en-IN-Wavenet-A', -- [5] FEMALE - ["en-IN-Wavenet-B"] = 'en-IN-Wavenet-B', -- [6] MALE - ["en-IN-Wavenet-C"] = 'en-IN-Wavenet-C', -- [7] MALE - ["en-IN-Wavenet-D"] = 'en-IN-Wavenet-D', -- [8] FEMALE - ["en-GB-Wavenet-A"] = 'en-GB-Wavenet-A', -- [9] FEMALE - ["en-GB-Wavenet-B"] = 'en-GB-Wavenet-B', -- [10] MALE - ["en-GB-Wavenet-C"] = 'en-GB-Wavenet-C', -- [11] FEMALE - ["en-GB-Wavenet-D"] = 'en-GB-Wavenet-D', -- [12] MALE - ["en-GB-Wavenet-F"] = 'en-GB-Wavenet-F', -- [13] FEMALE - ["en-US-Wavenet-A"] = 'en-US-Wavenet-A', -- [14] MALE - ["en-US-Wavenet-B"] = 'en-US-Wavenet-B', -- [15] MALE - ["en-US-Wavenet-C"] = 'en-US-Wavenet-C', -- [16] FEMALE - ["en-US-Wavenet-D"] = 'en-US-Wavenet-D', -- [17] MALE - ["en-US-Wavenet-E"] = 'en-US-Wavenet-E', -- [18] FEMALE - ["en-US-Wavenet-F"] = 'en-US-Wavenet-F', -- [19] FEMALE - ["en-US-Wavenet-G"] = 'en-US-Wavenet-G', -- [20] FEMALE - ["en-US-Wavenet-H"] = 'en-US-Wavenet-H', -- [21] FEMALE - ["en-US-Wavenet-I"] = 'en-US-Wavenet-I', -- [22] MALE - ["en-US-Wavenet-J"] = 'en-US-Wavenet-J', -- [23] MALE - ["fr-FR-Wavenet-A"] = "fr-FR-Wavenet-A", -- Female - ["fr-FR-Wavenet-B"] = "fr-FR-Wavenet-B", -- Male - ["fr-FR-Wavenet-C"] = "fr-FR-Wavenet-C", -- Female - ["fr-FR-Wavenet-D"] = "fr-FR-Wavenet-D", -- Male - ["fr-FR-Wavenet-E"] = "fr-FR-Wavenet-E", -- Female - ["de-DE-Wavenet-A"] = "de-DE-Wavenet-A", -- Female - ["de-DE-Wavenet-B"] = "de-DE-Wavenet-B", -- Male - ["de-DE-Wavenet-C"] = "de-DE-Wavenet-C", -- Female - ["de-DE-Wavenet-D"] = "de-DE-Wavenet-D", -- Male - ["de-DE-Wavenet-E"] = "de-DE-Wavenet-E", -- Male - ["de-DE-Wavenet-F"] = "de-DE-Wavenet-F", -- Female - ["es-ES-Wavenet-B"] = "es-ES-Wavenet-B", -- Male - ["es-ES-Wavenet-C"] = "es-ES-Wavenet-C", -- Female - ["es-ES-Wavenet-D"] = "es-ES-Wavenet-D", -- Female - ["it-IT-Wavenet-A"] = "it-IT-Wavenet-A", -- Female - ["it-IT-Wavenet-B"] = "it-IT-Wavenet-B", -- Female - ["it-IT-Wavenet-C"] = "it-IT-Wavenet-C", -- Male - ["it-IT-Wavenet-D"] = "it-IT-Wavenet-D", -- Male + ["en_AU_Wavenet_A"] = 'en-AU-Wavenet-A', -- [1] FEMALE + ["en_AU_Wavenet_B"] = 'en-AU-Wavenet-B', -- [2] MALE + ["en_AU_Wavenet_C"] = 'en-AU-Wavenet-C', -- [3] FEMALE + ["en_AU_Wavenet_D"] = 'en-AU-Wavenet-D', -- [4] MALE + ["en_IN_Wavenet_A"] = 'en-IN-Wavenet-A', -- [5] FEMALE + ["en_IN_Wavenet_B"] = 'en-IN-Wavenet-B', -- [6] MALE + ["en_IN_Wavenet_C"] = 'en-IN-Wavenet-C', -- [7] MALE + ["en_IN_Wavenet_D"] = 'en-IN-Wavenet-D', -- [8] FEMALE + ["en_GB_Wavenet_A"] = 'en-GB-Wavenet-A', -- [9] FEMALE + ["en_GB_Wavenet_B"] = 'en-GB-Wavenet-B', -- [10] MALE + ["en_GB_Wavenet_C"] = 'en-GB-Wavenet-C', -- [11] FEMALE + ["en_GB_Wavenet_D"] = 'en-GB-Wavenet-D', -- [12] MALE + ["en_GB_Wavenet_F"] = 'en-GB-Wavenet-F', -- [13] FEMALE + ["en_US_Wavenet_A"] = 'en-US-Wavenet-A', -- [14] MALE + ["en_US_Wavenet_B"] = 'en-US-Wavenet-B', -- [15] MALE + ["en_US_Wavenet_C"] = 'en-US-Wavenet-C', -- [16] FEMALE + ["en_US_Wavenet_D"] = 'en-US-Wavenet-D', -- [17] MALE + ["en_US_Wavenet_E"] = 'en-US-Wavenet-E', -- [18] FEMALE + ["en_US_Wavenet_F"] = 'en-US-Wavenet-F', -- [19] FEMALE + ["en_US_Wavenet_G"] = 'en-US-Wavenet-G', -- [20] FEMALE + ["en_US_Wavenet_H"] = 'en-US-Wavenet-H', -- [21] FEMALE + ["en_US_Wavenet_I"] = 'en-US-Wavenet-I', -- [22] MALE + ["en_US_Wavenet_J"] = 'en-US-Wavenet-J', -- [23] MALE + ["fr_FR_Wavenet_A"] = "fr-FR-Wavenet-A", -- Female + ["fr_FR_Wavenet_B"] = "fr-FR-Wavenet-B", -- Male + ["fr_FR_Wavenet_C"] = "fr-FR-Wavenet-C", -- Female + ["fr_FR_Wavenet_D"] = "fr-FR-Wavenet-D", -- Male + ["fr_FR_Wavenet_E"] = "fr-FR-Wavenet-E", -- Female + ["de_DE_Wavenet_A"] = "de-DE-Wavenet-A", -- Female + ["de_DE_Wavenet_B"] = "de-DE-Wavenet-B", -- Male + ["de_DE_Wavenet_C"] = "de-DE-Wavenet-C", -- Female + ["de_DE_Wavenet_D"] = "de-DE-Wavenet-D", -- Male + ["de_DE_Wavenet_E"] = "de-DE-Wavenet-E", -- Male + ["de_DE_Wavenet_F"] = "de-DE-Wavenet-F", -- Female + ["es_ES_Wavenet_B"] = "es-ES-Wavenet-B", -- Male + ["es_ES_Wavenet_C"] = "es-ES-Wavenet-C", -- Female + ["es_ES_Wavenet_D"] = "es-ES-Wavenet-D", -- Female + ["it_IT_Wavenet_A"] = "it-IT-Wavenet-A", -- Female + ["it_IT_Wavenet_B"] = "it-IT-Wavenet-B", -- Female + ["it_IT_Wavenet_C"] = "it-IT-Wavenet-C", -- Male + ["it_IT_Wavenet_D"] = "it-IT-Wavenet-D", -- Male } , }, }