From ef4398a5f18b4d346d679cb13cc051f3d1b4260d Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Thu, 5 May 2022 11:35:27 +0200 Subject: [PATCH] SRS - adding volume setting and a test on OS and IO available OpsGroup - added volume options for `SetSRS` --- Moose Development/Moose/Ops/OpsGroup.lua | 4 +++- Moose Development/Moose/Sound/SRS.lua | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Moose Development/Moose/Ops/OpsGroup.lua b/Moose Development/Moose/Ops/OpsGroup.lua index c95c7ecea..cd0203d67 100644 --- a/Moose Development/Moose/Ops/OpsGroup.lua +++ b/Moose Development/Moose/Ops/OpsGroup.lua @@ -2039,8 +2039,9 @@ end -- @param #number Port SRS port. Default 5002. -- @param #string PathToGoogleKey Full path to the google credentials JSON file, e.g. `"C:\Users\myUsername\Downloads\key.json"`. -- @param #string Label Label of the SRS comms for the SRS Radio overlay. Defaults to "ROBOT". No spaces allowed! +-- @param #number Volume Volume to be set, 0.0 = silent, 1.0 = loudest. Defaults to 1.0 -- @return #OPSGROUP self -function OPSGROUP:SetSRS(PathToSRS, Gender, Culture, Voice, Port, PathToGoogleKey, Label) +function OPSGROUP:SetSRS(PathToSRS, Gender, Culture, Voice, Port, PathToGoogleKey, Label, Volume) self.useSRS=true self.msrs=MSRS:New(PathToSRS, self.frequency, self.modulation) self.msrs:SetGender(Gender) @@ -2052,6 +2053,7 @@ function OPSGROUP:SetSRS(PathToSRS, Gender, Culture, Voice, Port, PathToGoogleKe self.msrs:SetGoogle(PathToGoogleKey) end self.msrs:SetCoalition(self:GetCoalition()) + self.msrs:SetVolume(Volume) return self end diff --git a/Moose Development/Moose/Sound/SRS.lua b/Moose Development/Moose/Sound/SRS.lua index 14ea4964a..e3d937a35 100644 --- a/Moose Development/Moose/Sound/SRS.lua +++ b/Moose Development/Moose/Sound/SRS.lua @@ -110,7 +110,11 @@ -- ## Set SRS Port -- -- Use @{#MSRS.SetPort} to define the SRS port. Defaults to 5002. --- +-- +-- ## Set SRS Volume +-- +-- Use @{#MSRS.SetVolume} to define the SRS volume. Defaults to 1.0. Allowed values are between 0.0 and 1.0, from silent to loudest. +-- -- @field #MSRS MSRS = { ClassName = "MSRS",