Fix #74 #78 #45

.vscode/launch.json

@@ -4,11 +4,23 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        {
+            "name": "default",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/build/vector_audio.app/Contents/MacOS/vector_audio",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}/resources",
+            "environment": [],
+            "externalConsole": false,
+            "MIMode": "lldb"
+        },
         {
             "name": "(lldb) Launch",
             "type": "lldb",
             "request": "launch",
-            "program": "${workspaceFolder}/build/vector_audio",
+            "program": "${workspaceFolder}/resources/vector_audio",
             "args": [],
             "preRunCommands": ["settings set platform.plugin.darwin.ignored-exceptions EXC_BAD_INSTRUCTION", "process handle SIGILL -n false -p true -s false"],
             "initCommands": ["settings set platform.plugin.darwin.ignored-exceptions EXC_BAD_INSTRUCTION", "process handle SIGILL -n false -p true -s false"],

bundle_osx.sh

@@ -36,4 +36,5 @@ install_name_tool -add_rpath "@executable_path/../Frameworks" build/VectorAudio.
 rm resources/VectorAudio.icns
 
 xattr -cr build/VectorAudio.app
-codesign --force --deep -s - build/VectorAudio.app
+codesign --force --timestamp -s - build/VectorAudio.app/Contents/Frameworks/libafv_native.dylib
+codesign --force --deep --timestamp -s - build/VectorAudio.app

collect_licenses.py

@@ -19,7 +19,8 @@
     ['ImGui', os.path.join('extern', 'imgui', 'LICENSE.txt')], 
     ['Platform Folders', os.path.join('extern', 'PlatformFolders', 'LICENSE')],
     ['Airports Database', os.path.join('resources', 'LICENSE_AIRPORTS')],
-    ['swift pilot client', os.path.join('resources', 'LICENSE_SWIFT')]]
+    ['swift pilot client', os.path.join('resources', 'LICENSE_SWIFT')],
+    ['audio alert tune', os.path.join('resources', 'LICENSE_AUDIO_ALERT')]]
 
 for sublicense in submodules_licenses:
     print('Getting license for: ' + sublicense[0])

include/application.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "afv-native/atcClientWrapper.h"
-#include "config.h"
 #include "afv-native/event.h"
+#include "config.h"
 #include "imgui.h"
 #include "imgui_internal.h"
 #include "imgui_stdlib.h"
@@ -45,6 +45,17 @@ class App {
         afv_native::ClientEventType evt, void* data, void* data2);
     void buildSDKServer();
 
+    void disconnectAndCleanup();
+
+    void playErrorSound()
+    {
+        if (!disconnect_warning_sound_available) {
+            return;
+        }
+        // Load the warning sound for disconnection
+        sound_player_.play();
+    };
+
     // Used in another thread
     static void loadAirportsDatabaseAsync();
 
@@ -53,9 +64,8 @@ class App {
 
     std::unique_ptr<vector_audio::vatsim::DataHandler> dataHandler_;
 
-    sf::SoundBuffer disconnectWarningSoundbuffer_;
-    sf::Sound soundPlayer_;
-    bool disconnectWarningSoundAvailable_ = true;
     bool manuallyDisconnected_ = false;
+    sf::SoundBuffer disconnect_warning_soundbuffer_;
+    sf::Sound sound_player_;
 };
 }

include/shared.h

@@ -93,9 +93,6 @@ inline std::string station_add_callsign = "";
 inline std::string station_auto_add_callsign = "";
 inline float station_add_frequency = 118.0;
 
-inline std::vector<int> StationsPendingRemoval;
-inline std::vector<int> StationsPendingRxChange;
-
 inline afv_native::HardwareType hardware
     = afv_native::HardwareType::Schmid_ED_137B;
 

include/util.h

@@ -1,6 +1,8 @@
 #pragma once
 #include "imgui.h"
 #include "shared.h"
+#include <SFML/Audio/Sound.hpp>
+#include <SFML/Audio/SoundBuffer.hpp>
 #include <SFML/Window/Keyboard.hpp>
 #include <afv-native/hardwareType.h>
 #include <algorithm>
@@ -135,7 +137,7 @@ inline int round8_33kHzChannel(int fKHz)
         fKHz = lower_diff < upper_diff ? lower : upper;
         fKHz = std::clamp(fKHz, 118000, 136990);
     }
-    return fKHz*100;
+    return fKHz * 100;
 }
 
 inline void TextURL(const std::string& name_, std::string URL_)
@@ -181,7 +183,8 @@ inline int cleanUpFrequency(int frequency)
         return util::round8_33kHzChannel(frequency);
     }
 
-    return std::clamp(frequency, 118000000, 136990000);;
+    return std::clamp(frequency, 118000000, 136990000);
+    ;
 }
 
 static bool endsWith(const std::string& str, const std::string& suffix)
@@ -219,6 +222,8 @@ inline static std::string findHeadsetInputDeviceOrDefault()
     return vector_audio::shared::availableInputDevices.front();
 }
 
+inline static bool disconnect_warning_sound_available = true;
+
 inline static std::string findHeadsetOutputDeviceOrDefault()
 {
     if (std::find(vector_audio::shared::availableOutputDevices.begin(),

lib/include/afv-native/atcClientWrapper.h

@@ -14,7 +14,7 @@ namespace afv_native::api {
         public:
             AFV_NATIVE_API static void setLogger(afv_native::log_fn gLogger);
 
-            AFV_NATIVE_API explicit atcClient(std::string clientName, std::string resourcePath = "");
+            AFV_NATIVE_API atcClient(std::string clientName, std::string resourcePath = "");
             AFV_NATIVE_API ~atcClient();
 
             AFV_NATIVE_API bool IsInitialized();

lib/include/afv-native/event.h

@@ -55,7 +55,8 @@ namespace afv_native {
         VccsReceived,
         StationDataReceived,
         InputDeviceError,
-        AudioDisabled
+        AudioDisabled,
+        AudioDeviceStoppedError, // data is a pointer to a std::string of the relevant device name
     };
 
     namespace afv {

resources/LICENSE.txt

@@ -1480,6 +1480,10 @@ Public License instead of this License.  But first, please read
 <https://www.gnu.org/licenses/why-not-lgpl.html>.
 
 
+audio alert tune
+
+Sound Effect by <a href="https://pixabay.com/users/universfield-28281460/?utm_source=link-attribution&utm_medium=referral&utm_campaign=music&utm_content=153266">UNIVERSFIELD</a> from <a href="https://pixabay.com/sound-effects//?utm_source=link-attribution&utm_medium=referral&utm_campaign=music&utm_content=153266">Pixabay</a>
+
 libflac_arm64-osx
 
 Copyright (C) 2000-2009  Josh Coalson

resources/LICENSE_AUDIO_ALERT

@@ -0,0 +1 @@
+Sound Effect by <a href="https://pixabay.com/users/universfield-28281460/?utm_source=link-attribution&utm_medium=referral&utm_campaign=music&utm_content=132111">UNIVERSFIELD</a> from <a href="https://pixabay.com//?utm_source=link-attribution&utm_medium=referral&utm_campaign=music&utm_content=132111">Pixabay</a>

resources/imgui.ini

@@ -0,0 +1,20 @@
+[Window][MainWindow]
+Pos=0,0
+Size=800,600
+Collapsed=0
+
+[Window][Debug##Default]
+Pos=60,60
+Size=400,400
+Collapsed=0
+
+[Window][Settings Panel]
+Pos=158,51
+Size=484,498
+Collapsed=0
+
+[Window][Error]
+Pos=250,237
+Size=300,126
+Collapsed=0
+