Merge pull request #606 from drowe67/ms-report-os-usage

Report OS usage to FreeDV Reporter.

Author: tmiw

USER_MANUAL.md

@@ -926,6 +926,8 @@ LDPC | Low Density Parity Check Codes - a family of powerful FEC codes
     * Add ability to double-click FreeDV Reporter entries to change the radio's frequency. (PR #592)
     * FreeDV Reporter: Add ability to force RX Only reporting in Tools->Options. (PR #599)
     * Add new 160m/80m/40m calling frequencies for IARU R2. (PR #601)
+3. Other:
+    * Report OS usage to FreeDV Reporter. (PR #606)
 
 ## V1.9.4 October 2023
 

src/os/os_interface.h

@@ -23,6 +23,7 @@
 #define __OS_INTERFACE__
 
 #include <future>
+#include <string>
 
 // Checks whether FreeDV has permissions to access the microphone on OSX Catalina
 // and above. If the user doesn't grant permissions (returns FALSE), the GUI 
@@ -38,4 +39,8 @@ void VerifyMicrophonePermissions(std::promise<bool>& promise);
 // for more details.
 extern "C" void ResetMainWindowColorSpace();
 
+// Retrieves a string representing the operating system that FreeDV is running on.
+// This can be either "windows", "linux", "macos" or "other".
+std::string GetOperatingSystemString();
+
 #endif // __OS_INTERFACE__

src/os/osx_interface.mm

@@ -75,3 +75,8 @@ void ResetMainWindowColorSpace()
     assert(cs != nullptr);
     CGColorSpaceRelease(cs);
 }
+
+std::string GetOperatingSystemString()
+{
+    return "macos";
+}

src/os/osx_stubs.cpp

@@ -30,4 +30,15 @@ void VerifyMicrophonePermissions(std::promise<bool>& micPromise)
 void ResetMainWindowColorSpace()
 {
     // empty
+}
+
+std::string GetOperatingSystemString()
+{
+#ifdef __linux__
+    return "linux";
+#elif _WIN32
+    return "windows";
+#else
+    return "other";
+#endif // __linux__ || _WIN32
 }

src/reporting/FreeDVReporter.cpp

@@ -22,6 +22,7 @@
 
 #include "FreeDVReporter.h"
 #include "sio_client.h"
+#include "../os/os_interface.h"
 
 using namespace std::chrono_literals;
 
@@ -230,6 +231,7 @@ void FreeDVReporter::connect_()
         auth->insert("grid_square", gridSquare_);
         auth->insert("version", software_);
         auth->insert("rx_only", sio::bool_message::create(rxOnly_));
+        auth->insert("os", GetOperatingSystemString());
     }
 
     // Reconnect listener should re-report frequency so that "unknown"