Fix test alert sound

pierr3 · Oct 23, 2023 · a68fb58 · a68fb58
1 parent 4c0c0cd
commit a68fb58
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 17 deletions.
diff --git a/include/modals/settings.h b/include/modals/settings.h
@@ -15,6 +15,6 @@
 namespace vector_audio::modals {
 class Settings {
 public:
-    static void render(afv_native::api::atcClient* mClient);
+    static void render(afv_native::api::atcClient* mClient, const std::function<void()>& playAlertSound);
 };
 }
diff --git a/include/shared.h b/include/shared.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <SFML/Audio/SoundBuffer.hpp>
 #include <SFML/Window/Keyboard.hpp>
 #include <afv-native/hardwareType.h>
 #include <chrono>

diff --git a/src/application.cpp b/src/application.cpp
@@ -668,7 +668,7 @@ void App::render_frame()
     }
     style::pop_disabled_on(mClient_->IsAPIConnected());
 
-    vector_audio::modals::Settings::render(mClient_);
+    vector_audio::modals::Settings::render(mClient_, [this]() -> void { playErrorSound(); });
 
     {
         ImGui::SetNextWindowSize(ImVec2(300, -1));

diff --git a/src/modals/settings.cpp b/src/modals/settings.cpp
@@ -3,7 +3,7 @@
 #include "imgui.h"
 #include "util.h"
 
-void vector_audio::modals::Settings::render(afv_native::api::atcClient* mClient)
+void vector_audio::modals::Settings::render(afv_native::api::atcClient* mClient, const std::function<void()>& playAlertSound)
 {
     // Settings modal definition
     if (ImGui::BeginPopupModal("Settings Panel")) {
@@ -399,21 +399,10 @@ void vector_audio::modals::Settings::render(afv_native::api::atcClient* mClient)
                 1 - (vector_audio::shared::mPeak / -40.F), ImVec2(-1.F, 7.F),
                 ImColor(0, 200, 100), ImColor(219, 201, 0));
 
+            ImGui::NewLine();
+
             if (ImGui::Button("Test alert sound")) {
-                sf::SoundBuffer disconnect_warning_soundbuffer;
-                sf::Sound sound_player;
-
-                auto sound_path = Configuration::get_resource_folder()
-                    / std::filesystem::path("disconnect.wav");
-
-                if (!disconnect_warning_soundbuffer.loadFromFile(sound_path)) {
-                    disconnect_warning_sound_available = false;
-                    spdlog::error("Could not load warning sound file, "
-                                  "disconnection will be silent");
-                } else {
-                    sound_player.setBuffer(disconnect_warning_soundbuffer);
-                    sound_player.play();
-                }
+               playAlertSound();
             }
             ImGui::SameLine();
             vector_audio::util::HelpMarker(