From 4ac583e4345a36f8e2af2c226c62886b5dbc2c05 Mon Sep 17 00:00:00 2001
From: Applevangelist <post@tniedermeier.com>
Date: Tue, 9 Jan 2024 17:28:58 +0100
Subject: [PATCH] SRS changes

---
 Moose Development/Moose/Ops/Airboss.lua |  3 ++-
 Moose Development/Moose/Sound/SRS.lua   | 36 ++++++++++++++++++++++---
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/Moose Development/Moose/Ops/Airboss.lua b/Moose Development/Moose/Ops/Airboss.lua
index d7a467e44..1b9355b11 100644
--- a/Moose Development/Moose/Ops/Airboss.lua	
+++ b/Moose Development/Moose/Ops/Airboss.lua	
@@ -3062,7 +3062,7 @@ function AIRBOSS:EnableSRS(PathToSRS,Port,Culture,Gender,Voice,GoogleCreds,Volum
   -- SRS
   local Frequency = self.AirbossRadio.frequency
   local Modulation = self.AirbossRadio.modulation
-  self.SRS = MSRS:New(PathToSRS,Frequency,Modulation,Volume,AltBackend)
+  self.SRS = MSRS:New(PathToSRS,Frequency,Modulation,AltBackend)
   self.SRS:SetCoalition(self:GetCoalition())
   self.SRS:SetCoordinate(self:GetCoordinate())
   self.SRS:SetCulture(Culture or "en-US")
@@ -3072,6 +3072,7 @@ function AIRBOSS:EnableSRS(PathToSRS,Port,Culture,Gender,Voice,GoogleCreds,Volum
   self.SRS:SetPort(Port or 5002)
   self.SRS:SetLabel(self.AirbossRadio.alias or "AIRBOSS")
   self.SRS:SetCoordinate(self.carrier:GetCoordinate())
+  self.SRS:SetVolume(Volume or 1)
   --self.SRS:SetModulations(Modulations)
   if GoogleCreds then
     self.SRS:SetGoogle(GoogleCreds)
diff --git a/Moose Development/Moose/Sound/SRS.lua b/Moose Development/Moose/Sound/SRS.lua
index ec38d5862..9d075dfd0 100644
--- a/Moose Development/Moose/Sound/SRS.lua	
+++ b/Moose Development/Moose/Sound/SRS.lua	
@@ -265,19 +265,47 @@ MSRS.version="0.3.0"
 --- Voices
 -- @type MSRS.Voices
 MSRS.Voices = {
-  Microsoft = {
+  Microsoft = { -- working ones if not using gRPC and MS
     ["Hedda"] = "Microsoft Hedda Desktop", -- de-DE
     ["Hazel"] = "Microsoft Hazel Desktop", -- en-GB
     ["David"] = "Microsoft David Desktop", -- en-US
     ["Zira"] = "Microsoft Zira Desktop", -- en-US
     ["Hortense"] = "Microsoft Hortense Desktop", --fr-FR
+    ["de-DE-Hedda"] = "Microsoft Hedda Desktop", -- de-DE
+    ["en-GB-Hazel"] = "Microsoft Hazel Desktop", -- en-GB
+    ["en-US-David"] = "Microsoft David Desktop", -- en-US
+    ["en-US-Zira"] = "Microsoft Zira Desktop", -- en-US
+    ["fr-FR-Hortense"] = "Microsoft Hortense Desktop", --fr-FR
     },
-  MicrosoftGRPC = {
-    ["Hedda"] = "Hedda", -- de-DE
+  MicrosoftGRPC = { -- en-US/GB voices only as of Jan 2024, working ones if using gRPC and MS, if voice packs are installed
+    --["Hedda"] = "Hedda", -- de-DE
     ["Hazel"] = "Hazel", -- en-GB
+    ["George"] = "George", -- en-GB
+    ["Susan"] = "Susan", -- en-GB
     ["David"] = "David", -- en-US
     ["Zira"] = "Zira", -- en-US
-    ["Hortense"] = "Hortense", --fr-FR
+    ["Mark"] = "Mark", -- en-US
+    ["James"] = "James", --en-AU
+    ["Catherine"] = "Catherine", --en-AU
+    ["Richard"] = "Richard", --en-CA
+    ["Linda"] = "Linda", --en-CA
+    ["Ravi"] = "Ravi", --en-IN
+    ["Heera"] = "Heera", --en-IN
+    ["Sean"] = "Sean", --en-IR
+    ["en_GB_Hazel"] = "Hazel", -- en-GB
+    ["en_GB_George"] = "George", -- en-GB
+    ["en_GB_Susan"] = "Susan", -- en-GB
+    ["en_US_David"] = "David", -- en-US
+    ["en_US_Zira"] = "Zira", -- en-US
+    ["en_US_Mark"] = "Mark", -- en-US
+    ["en_AU_James"] = "James", --en-AU
+    ["en_AU_Catherine"] = "Catherine", --en-AU
+    ["en_CA_Richard"] = "Richard", --en-CA
+    ["en_CA_Linda"] = "Linda", --en-CA
+    ["en_IN_Ravi"] = "Ravi", --en-IN
+    ["en_IN_Heera"] = "Heera", --en-IN
+    ["en_IR_Sean"] = "Sean", --en-IR
+    --]]     
     },  
   Google = {
     Standard = {