FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
This commit is contained in:
Applevangelist 2023-12-31 17:25:32 +01:00
commit dd771a089c
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Moose Development/Moose/Sound/SRS.lua
View File

@ -972,7 +972,6 @@ end
function MSRS:SetProviderOptionsGoogle(CredentialsFile, AccessKey) function MSRS:SetProviderOptionsGoogle(CredentialsFile, AccessKey)
self:F( {CredentialsFile, AccessKey} ) self:F( {CredentialsFile, AccessKey} )
self:SetProviderOptions(MSRS.Provider.GOOGLE, CredentialsFile, AccessKey) self:SetProviderOptions(MSRS.Provider.GOOGLE, CredentialsFile, AccessKey)
return self return self
end end
@ -985,7 +984,6 @@ end
function MSRS:SetProviderOptionsAmazon(AccessKey, SecretKey, Region) function MSRS:SetProviderOptionsAmazon(AccessKey, SecretKey, Region)
self:F( {AccessKey, SecretKey, Region} ) self:F( {AccessKey, SecretKey, Region} )
self:SetProviderOptions(MSRS.Provider.AMAZON, nil, AccessKey, SecretKey, Region) self:SetProviderOptions(MSRS.Provider.AMAZON, nil, AccessKey, SecretKey, Region)
return self return self
end end
@ -997,7 +995,6 @@ end
function MSRS:SetProviderOptionsAzure(AccessKey, Region) function MSRS:SetProviderOptionsAzure(AccessKey, Region)
self:F( {AccessKey, Region} ) self:F( {AccessKey, Region} )
self:SetProviderOptions(MSRS.Provider.AZURE, nil, AccessKey, nil, Region) self:SetProviderOptions(MSRS.Provider.AZURE, nil, AccessKey, nil, Region)
return self return self
end end
@ -1164,14 +1161,10 @@ function MSRS:PlayText(Text, Delay, Coordinate)
else else
if self.backend==MSRS.Backend.GRPC then if self.backend==MSRS.Backend.GRPC then
self:T(self.lid.."Transmitting") self:T(self.lid.."Transmitting")
self:_DCSgRPCtts(Text, nil, nil , nil, nil, nil, nil, Coordinate) self:_DCSgRPCtts(Text, nil, nil , nil, nil, nil, nil, Coordinate)
else else
self:PlayTextExt(Text, Delay, nil, nil, nil, nil, nil, nil, nil, Coordinate) self:PlayTextExt(Text, Delay, nil, nil, nil, nil, nil, nil, nil, Coordinate)
end end
end end