Release 2.0.8.5

ciribob · Mar 27, 2023 · ed35236 · ed35236
1 parent 83f0b81
commit ed35236
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 38 deletions.
diff --git a/AutoUpdater/Properties/AssemblyInfo.cs b/AutoUpdater/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.8.4")]
-[assembly: AssemblyFileVersion("2.0.8.4")]
+[assembly: AssemblyVersion("2.0.8.5")]
+[assembly: AssemblyFileVersion("2.0.8.5")]
diff --git a/DCS-SR-Client/Audio/Recording/AudioRecordingManager.cs b/DCS-SR-Client/Audio/Recording/AudioRecordingManager.cs
@@ -102,26 +102,23 @@ private void ProcessQueues()
 
                 Thread.Sleep(500);
 
-                if (GlobalSettingsStore.Instance.GetClientSettingBool(GlobalSettingsKeys.RecordAudio))
+                // if we're recording audio, check to see if any mixdown queue has data. if so,
+                // start recording. if we're not recording, just run this thread doing nothing.
+                for (int i = 0; i < MAX_RADIOS; i++)
                 {
-                    // if we're recording audio, check to see if any mixdown queue has data. if so,
-                    // start recording. if we're not recording, just run this thread doing nothing.
-                    for (int i = 0; i < MAX_RADIOS; i++)
+                    if ((_playerRawQueues[i].Count > 0) || (_clientRawQueues[i].Count > 0))
                     {
-                        if ((_playerRawQueues[i].Count > 0) || (_clientRawQueues[i].Count > 0))
+                        for (int j = 0; j < MAX_RADIOS; j++)
                         {
-                            for (int j = 0; j < MAX_RADIOS; j++)
-                            {
-                                _clientFullQueues[j].StartRecording(tickTime);
-                                _playerFullQueues[j].StartRecording(tickTime);
-                            }
-                            isRecording = true;
-                            break;
+                            _clientFullQueues[j].StartRecording(tickTime);
+                            _playerFullQueues[j].StartRecording(tickTime);
                         }
+                        isRecording = true;
+                        break;
                     }
                 }
+
             }
-
             _logger.Info("Transmission recording started.");
 
             // record audio. pull samples from the raw queues and hydrate them in the full queues.
@@ -238,6 +235,13 @@ private float[] SingleRadioMixDown(List<DeJitteredTransmission> mainAudio, List<
 
         public void Start()
         {
+            if (!GlobalSettingsStore.Instance.GetClientSettingBool(GlobalSettingsKeys.RecordAudio))
+            {
+                _processThreadDone = true;
+                _logger.Info("Transmission recording disabled");
+                return;
+            }
+
             _logger.Info("Transmission recording waiting for audio.");
 
             // clear out existing queue lists and rebuild them from scratch. queues include

diff --git a/DCS-SR-Client/Properties/AssemblyInfo.cs b/DCS-SR-Client/Properties/AssemblyInfo.cs
@@ -52,5 +52,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.0.8.4")]
-[assembly: AssemblyFileVersion("2.0.8.4")]
+[assembly: AssemblyVersion("2.0.8.5")]
+[assembly: AssemblyFileVersion("2.0.8.5")]
diff --git a/DCS-SR-Common/Network/UpdaterChecker.cs b/DCS-SR-Common/Network/UpdaterChecker.cs
@@ -21,7 +21,7 @@ public class UpdaterChecker
 
         public static readonly string MINIMUM_PROTOCOL_VERSION = "1.9.0.0";
 
-        public static readonly string VERSION = "2.0.8.4";
+        public static readonly string VERSION = "2.0.8.5";
 
         private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
 

diff --git a/DCS-SR-ExternalAudio/Properties/AssemblyInfo.cs b/DCS-SR-ExternalAudio/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.8.4")]
-[assembly: AssemblyFileVersion("2.0.8.4")]
+[assembly: AssemblyVersion("2.0.8.5")]
+[assembly: AssemblyFileVersion("2.0.8.5")]
diff --git a/DCS-SimpleRadio Server/Properties/AssemblyInfo.cs b/DCS-SimpleRadio Server/Properties/AssemblyInfo.cs
@@ -52,5 +52,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.0.8.4")]
-[assembly: AssemblyFileVersion("2.0.8.4")]
+[assembly: AssemblyVersion("2.0.8.5")]
+[assembly: AssemblyFileVersion("2.0.8.5")]
diff --git a/Installer/MainWindow.xaml.cs b/Installer/MainWindow.xaml.cs
@@ -32,7 +32,7 @@ namespace Installer
     public partial class MainWindow
     {
         private const string REG_PATH = "HKEY_CURRENT_USER\\SOFTWARE\\DCS-SR-Standalone";
-        private const string EXPORT_SRS_LUA = "pcall(function() local dcsSr=require('lfs');dofile(dcsSr.writedir()..[[Mods\\Services\\DCS-SRS\\Scripts\\DCS-SimpleRadioStandalone.lua]]); end,nil);";
+        private const string EXPORT_SRS_LUA = "pcall(function() local dcsSr=require('lfs');dofile(dcsSr.writedir()..[[Mods\\Services\\DCS-SRS\\Scripts\\DCS-SimpleRadioStandalone.lua]]); end,nil)";
         private readonly string _currentDirectory;
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
         private ProgressBarDialog _progressBarDialog = null;

diff --git a/Installer/Properties/AssemblyInfo.cs b/Installer/Properties/AssemblyInfo.cs
@@ -52,5 +52,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.0.8.4")]
-[assembly: AssemblyFileVersion("2.0.8.4")]
+[assembly: AssemblyVersion("2.0.8.5")]
+[assembly: AssemblyFileVersion("2.0.8.5")]
diff --git a/Scripts/DCS-SRS-AutoConnectGameGUI.lua b/Scripts/DCS-SRS-AutoConnectGameGUI.lua
@@ -1,4 +1,4 @@
--- Version 2.0.7.1
+-- Version 2.0.8.5
 -- ONLY COPY THIS WHOLE FILE IS YOU ARE GOING TO HOST A SERVER!
 -- The file must be in Saved Games\DCS\Scripts\Hooks or Saved Games\DCS.openalpha\Scripts\Hooks
 -- Make sure you enter the correct address into SERVER_SRS_HOST and SERVER_SRS_PORT (5002 by default) below.
@@ -9,9 +9,9 @@
 -- User options --
 local SRSAuto = {}
 
-SRSAuto.SERVER_SRS_HOST_AUTO = false -- if set to true SRS will set the SERVER_SRS_HOST for you! - Currently disabled
+SRSAuto.SERVER_SRS_HOST_AUTO = false -- if set to true SRS will set the SERVER_SRS_HOST for you!
 SRSAuto.SERVER_SRS_PORT = "5002" --  SRS Server default is 5002 TCP & UDP
-SRSAuto.SERVER_SRS_HOST = "127.0.0.1" -- overridden if SRS_HOST_AUTO is true -- set to your PUBLIC ipv4 address
+SRSAuto.SERVER_SRS_HOST = "127.0.0.1" -- overridden if SRS_HOST_AUTO is true -- set to your PUBLIC ipv4 address or domain srs.example.com
 SRSAuto.SERVER_SEND_AUTO_CONNECT = true -- set to false to disable auto connect or just remove this file 
 
 ---- SRS CHAT COMMANDS ----

diff --git a/Scripts/DCS-SRS/Scripts/DCS-SRS-OverlayGameGUI.lua b/Scripts/DCS-SRS/Scripts/DCS-SRS-OverlayGameGUI.lua
@@ -1,9 +1,9 @@
--- Version 2.0.8.4
+-- Version 2.0.8.5
 -- Make sure you COPY this file to the same location as the Export.lua as well! 
 -- Otherwise the Overlay will not work
 
 
-net.log("Loading - DCS-SRS Overlay GameGUI - Ciribob: 2.0.8.4 ")
+net.log("Loading - DCS-SRS Overlay GameGUI - Ciribob: 2.0.8.5 ")
 
 local base = _G
 
@@ -672,4 +672,4 @@ end
 
 DCS.setUserCallbacks(srsOverlay)
 
-net.log("Loaded - DCS-SRS Overlay GameGUI - Ciribob: 2.0.8.4 ")
+net.log("Loaded - DCS-SRS Overlay GameGUI - Ciribob: 2.0.8.5 ")
diff --git a/Scripts/DCS-SRS/Scripts/DCS-SRSGameGUI.lua b/Scripts/DCS-SRS/Scripts/DCS-SRSGameGUI.lua
@@ -1,8 +1,8 @@
--- Version 2.0.8.4
+-- Version 2.0.8.5
 -- Make sure you COPY this file to the same location as the Export.lua as well! 
 -- Otherwise the Radio Might not work
 
-net.log("Loading - DCS-SRS GameGUI - Ciribob: 2.0.8.4")
+net.log("Loading - DCS-SRS GameGUI - Ciribob: 2.0.8.5")
 local SRS = {}
 
 SRS.CLIENT_ACCEPT_AUTO_CONNECT = true --- Set to false if you want to disable AUTO CONNECT
@@ -354,5 +354,5 @@ end
 
 DCS.setUserCallbacks(SRS)
 
-net.log("Loaded - DCS-SRS GameGUI - Ciribob: 2.0.8.4")
+net.log("Loaded - DCS-SRS GameGUI - Ciribob: 2.0.8.5")
 
diff --git a/Scripts/DCS-SRS/Scripts/DCS-SimpleRadioStandalone.lua b/Scripts/DCS-SRS/Scripts/DCS-SimpleRadioStandalone.lua
@@ -1,4 +1,4 @@
--- Version 2.0.8.4
+-- Version 2.0.8.5
 -- Special thanks to Cap. Zeen, Tarres and Splash for all the help
 -- with getting the radio information :)
 -- Run the installer to correctly install this file
@@ -5306,4 +5306,4 @@ end
 -- Load mods' SRS plugins
 SR.LoadModsPlugins()
 
-SR.log("Loaded SimpleRadio Standalone Export version: 2.0.8.4")
+SR.log("Loaded SimpleRadio Standalone Export version: 2.0.8.5")
diff --git a/Scripts/DCS-SRS/entry.lua b/Scripts/DCS-SRS/entry.lua
@@ -4,7 +4,7 @@ declare_plugin("DCS-SRS", {
 	developerName = _("Ciribob"),
 	developerLink = _("https://github.com/ciribob/DCS-SimpleRadioStandalone"),
 	displayName = _("DCS SimpleRadio Standalone"),
-	version = "2.0.8.4",
+	version = "2.0.8.5",
 	state = "installed",
 	info = _("DCS-SimpleRadio Standalone\n\nBrings realistic VoIP comms to DCS with a cockpit integration with every aircraft\n\nCheck Special Settings for SRS integration settings\n\nSRS Discord for Support: https://discord.gg/baw7g3t"),
 	binaries = {"srs.dll"},

diff --git a/install-build/Readme.txt b/install-build/Readme.txt
@@ -14,7 +14,7 @@ Create the folders if they dont exist
 
 Add:
 
-pcall(function() local dcsSr=require('lfs');dofile(dcsSr.writedir()..[[Mods\Services\\DCS-SRS\\Scripts\\DCS-SimpleRadioStandalone.lua]]); end,nil);
+pcall(function() local dcsSr=require('lfs');dofile(dcsSr.writedir()..[[Mods\Services\\DCS-SRS\\Scripts\\DCS-SimpleRadioStandalone.lua]]); end,nil)
 
 To the END of the Export.lua file in C:\Users\USERNAME\Saved Games\DCS\Scripts