From 7995940579bf1d930841e7da44288b0cda82ee37 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Tue, 9 Jan 2024 17:27:26 +0100 Subject: [PATCH] SRS changes --- Moose Development/Moose/Ops/Airboss.lua | 4 ++-- Moose Development/Moose/Sound/SRS.lua | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Moose Development/Moose/Ops/Airboss.lua b/Moose Development/Moose/Ops/Airboss.lua index 28ccad0c9..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,7 +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) + 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 bbb9800d7..9d075dfd0 100644 --- a/Moose Development/Moose/Sound/SRS.lua +++ b/Moose Development/Moose/Sound/SRS.lua @@ -265,7 +265,7 @@ 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 @@ -277,7 +277,7 @@ MSRS.Voices = { ["en-US-Zira"] = "Microsoft Zira Desktop", -- en-US ["fr-FR-Hortense"] = "Microsoft Hortense Desktop", --fr-FR }, - MicrosoftGRPC = { -- en-US/GB voices only as of Jan 2024 + 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 @@ -285,7 +285,6 @@ MSRS.Voices = { ["David"] = "David", -- en-US ["Zira"] = "Zira", -- en-US ["Mark"] = "Mark", -- en-US - --[[ ["James"] = "James", --en-AU ["Catherine"] = "Catherine", --en-AU ["Richard"] = "Richard", --en-CA