weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-21 02:31:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master-ng' into develop

Browse Source
This commit is contained in:
Applevangelist
2026-03-07 09:57:00 +01:00
parent b99894768b 835b7d66a1
commit 5f7975b910
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Ops/CSAR.lua
+5 -3
View File
@@ -2833,17 +2833,19 @@ function CSAR:onafterStart(From, Event, To)
self.msrs = MSRS:New(path,channel,modulation) -- Sound.SRS#MSRS self.msrs = MSRS:New(path,channel,modulation) -- Sound.SRS#MSRS
self.msrs:SetPort(self.SRSport) self.msrs:SetPort(self.SRSport)
self.msrs:SetLabel("CSAR") self.msrs:SetLabel("CSAR")
self.msrs:SetBackend(self.SRSBackend) self.msrs:SetBackend(self.SRSBackend)
self.msrs:SetProvider(self.SRSProvider)
self.msrs.speed = self.SRSSpeed self.msrs.speed = self.SRSSpeed
self.msrs:SetCulture(self.SRSCulture) self.msrs:SetCulture(self.SRSCulture)
self.msrs:SetCoalition(self.coalition) self.msrs:SetCoalition(self.coalition)
self.msrs:SetVoice(self.SRSVoice) self.msrs:SetVoice(self.SRSVoice)
self.msrs:SetGender(self.SRSGender) self.msrs:SetGender(self.SRSGender)
if self.SRSGPathToCredentials then if self.SRSGPathToCredentials and (not self.SRSProvider) then
self.msrs:SetProviderOptionsGoogle(self.SRSGPathToCredentials,self.SRSGPathToCredentials) self.msrs:SetProviderOptionsGoogle(self.SRSGPathToCredentials,self.SRSGPathToCredentials)
self.msrs:SetProvider(MSRS.Provider.GOOGLE) self.msrs:SetProvider(MSRS.Provider.GOOGLE)
end end
if self.SRSProvider then
self.msrs:SetProvider(self.SRSProvider)
end
self.msrs:SetVolume(self.SRSVolume) self.msrs:SetVolume(self.SRSVolume)
self.msrs:SetLabel("CSAR") self.msrs:SetLabel("CSAR")
self.SRSQueue = MSRSQUEUE:New("CSAR") -- Sound.SRS#MSRSQUEUE self.SRSQueue = MSRSQUEUE:New("CSAR") -- Sound.SRS#MSRSQUEUE