SRS changes

This commit is contained in:
Applevangelist 2024-01-09 17:27:26 +01:00
parent 3ffdb4fe4b
commit 7995940579
2 changed files with 4 additions and 5 deletions

View File

@ -3062,7 +3062,7 @@ function AIRBOSS:EnableSRS(PathToSRS,Port,Culture,Gender,Voice,GoogleCreds,Volum
-- SRS -- SRS
local Frequency = self.AirbossRadio.frequency local Frequency = self.AirbossRadio.frequency
local Modulation = self.AirbossRadio.modulation 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:SetCoalition(self:GetCoalition())
self.SRS:SetCoordinate(self:GetCoordinate()) self.SRS:SetCoordinate(self:GetCoordinate())
self.SRS:SetCulture(Culture or "en-US") 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:SetPort(Port or 5002)
self.SRS:SetLabel(self.AirbossRadio.alias or "AIRBOSS") self.SRS:SetLabel(self.AirbossRadio.alias or "AIRBOSS")
self.SRS:SetCoordinate(self.carrier:GetCoordinate()) self.SRS:SetCoordinate(self.carrier:GetCoordinate())
self.SRS:SetVolume(Volume) self.SRS:SetVolume(Volume or 1)
--self.SRS:SetModulations(Modulations) --self.SRS:SetModulations(Modulations)
if GoogleCreds then if GoogleCreds then
self.SRS:SetGoogle(GoogleCreds) self.SRS:SetGoogle(GoogleCreds)

View File

@ -265,7 +265,7 @@ MSRS.version="0.3.0"
--- Voices --- Voices
-- @type MSRS.Voices -- @type MSRS.Voices
MSRS.Voices = { MSRS.Voices = {
Microsoft = { Microsoft = { -- working ones if not using gRPC and MS
["Hedda"] = "Microsoft Hedda Desktop", -- de-DE ["Hedda"] = "Microsoft Hedda Desktop", -- de-DE
["Hazel"] = "Microsoft Hazel Desktop", -- en-GB ["Hazel"] = "Microsoft Hazel Desktop", -- en-GB
["David"] = "Microsoft David Desktop", -- en-US ["David"] = "Microsoft David Desktop", -- en-US
@ -277,7 +277,7 @@ MSRS.Voices = {
["en-US-Zira"] = "Microsoft Zira Desktop", -- en-US ["en-US-Zira"] = "Microsoft Zira Desktop", -- en-US
["fr-FR-Hortense"] = "Microsoft Hortense Desktop", --fr-FR ["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 --["Hedda"] = "Hedda", -- de-DE
["Hazel"] = "Hazel", -- en-GB ["Hazel"] = "Hazel", -- en-GB
["George"] = "George", -- en-GB ["George"] = "George", -- en-GB
@ -285,7 +285,6 @@ MSRS.Voices = {
["David"] = "David", -- en-US ["David"] = "David", -- en-US
["Zira"] = "Zira", -- en-US ["Zira"] = "Zira", -- en-US
["Mark"] = "Mark", -- en-US ["Mark"] = "Mark", -- en-US
--[[
["James"] = "James", --en-AU ["James"] = "James", --en-AU
["Catherine"] = "Catherine", --en-AU ["Catherine"] = "Catherine", --en-AU
["Richard"] = "Richard", --en-CA ["Richard"] = "Richard", --en-CA