weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-08-15 10:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Applevangelist 2024-01-05 15:51:35 +01:00
commit f2783c46c2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1844,7 +1844,7 @@ end
-- @param #MSRSQUEUE self -- @param #MSRSQUEUE self
-- @return #MSRSQUEUE self The MSRSQUEUE object. -- @return #MSRSQUEUE self The MSRSQUEUE object.
function MSRSQUEUE:Clear() function MSRSQUEUE:Clear()
self:T((self.lid.."Clearing MSRSQUEUE") self:T(self.lid.."Clearing MSRSQUEUE")
self.queue={} self.queue={}
return self return self
end end
@ -1958,7 +1958,7 @@ end
-- @param #MSRSQUEUE self -- @param #MSRSQUEUE self
-- @param #MSRSQUEUE.Transmission transmission The transmission. -- @param #MSRSQUEUE.Transmission transmission The transmission.
function MSRSQUEUE:Broadcast(transmission) function MSRSQUEUE:Broadcast(transmission)
self:T((self.lid.."Broadcast") self:T(self.lid.."Broadcast")
if transmission.frequency then if transmission.frequency then
transmission.msrs:PlayTextExt(transmission.text, nil, transmission.frequency, transmission.modulation, transmission.gender, transmission.culture, transmission.voice, transmission.volume, transmission.label, transmission.coordinate) transmission.msrs:PlayTextExt(transmission.text, nil, transmission.frequency, transmission.modulation, transmission.gender, transmission.culture, transmission.voice, transmission.volume, transmission.label, transmission.coordinate)
@ -2128,7 +2128,7 @@ function MSRSQUEUE:_CheckRadioQueue(delay)
-- Found a new transmission. -- Found a new transmission.
if next~=nil and not playing then if next~=nil and not playing then
-- Debug info. -- Debug info.
self:T((self.lid..string.format("Broadcasting text=\"%s\" at T=%.3f", next.text, time)) self:T(self.lid..string.format("Broadcasting text=\"%s\" at T=%.3f", next.text, time))
-- Call SRS. -- Call SRS.
self:Broadcast(next) self:Broadcast(next)