AIRBOSS v0.2.5w

Moose Development/Moose/Core/Radio.lua

@@ -290,16 +290,28 @@ end
 function RADIO:NewUnitTransmission(FileName, Subtitle, SubtitleDuration, Frequency, Modulation, Loop)
   self:F({FileName, Subtitle, SubtitleDuration, Frequency, Modulation, Loop})
 
+  -- Set file name.
   self:SetFileName(FileName)
-  local Duration = 5
+
-  if SubtitleDuration then Duration = SubtitleDuration end
+  -- Set frequency.
-  -- SubtitleDuration argument was missing, adding it
+  if Frequency then 
-  if Subtitle then self:SetSubtitle(Subtitle, Duration) end
+    self:SetFrequency(Frequency)
-  -- self:SetSubtitleDuration is non existent, removing faulty line
+  end
-  -- if SubtitleDuration then self:SetSubtitleDuration(SubtitleDuration) end
+  
-  if Frequency then self:SetFrequency(Frequency) end
+  -- Set modulation AM/FM.
-  if Modulation then self:SetModulation(Modulation) end
+  if Modulation then
-  if Loop then self:SetLoop(Loop) end
+    self:SetModulation(Modulation)
+  end
+  
+  -- Set subtitle.
+  if Subtitle then
+    self:SetSubtitle(Subtitle, SubtitleDuration or 0)
+  end
+ 
+  -- Set Looping.
+  if Loop then 
+    self:SetLoop(Loop)
+  end
   
   return self
 end
@@ -313,19 +325,26 @@ end
 -- * If your POSITIONABLE is a UNIT or a GROUP, the Power is ignored.
 -- * If your POSITIONABLE is not a UNIT or a GROUP, the Subtitle, SubtitleDuration are ignored
 -- @param #RADIO self
+-- @param #string filename (Optinal) Sound file name. Default self.FileName.
+-- @param #string subtitle (Optional) Subtitle. Default self.Subtitle.
+-- @param #number subtitleduraction (Optional) Subtitle duraction. Default self.SubtitleDuration.
 -- @return #RADIO self
-function RADIO:Broadcast()
+function RADIO:Broadcast(filename, subtitle, subtitleduration)
   self:F()
   
+  filename=filename or self.FileName
+  subtitle=subtitle or self.Subtitle
+  subtitleduration=subtitleduration or self.SubtitleDuration
+  
   -- If the POSITIONABLE is actually a UNIT or a GROUP, use the more complicated DCS command system
   if self.Positionable.ClassName == "UNIT" or self.Positionable.ClassName == "GROUP" then
     self:T2("Broadcasting from a UNIT or a GROUP")
     self.Positionable:SetCommand({
       id = "TransmitMessage",
       params = {
-        file = self.FileName,
+        file = filename,
-        duration = self.SubtitleDuration,
+        duration = subtitleduration,
-        subtitle = self.Subtitle,
+        subtitle = subtitle,
         loop = self.Loop,
       }
     })
@@ -338,6 +357,8 @@ function RADIO:Broadcast()
   return self
 end
 
+
+
 --- Stops a transmission
 -- This function is especially usefull to stop the broadcast of looped transmissions
 -- @param #RADIO self