pulseaudio via single enable

beaumanvienna · Feb 27, 2024 · aaff720 · aaff720
1 parent d7609ec
commit aaff720
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 14 deletions.
diff --git a/application/lucre/UI/settingsScreen.cpp b/application/lucre/UI/settingsScreen.cpp
@@ -302,7 +302,7 @@ namespace LucreApp
 
     void SettingsScreen::SetSoundCallback()
     {
-        #ifdef LINUX
+        #ifdef PULSEAUDIO
             Sound::SetCallback([=](const LibPAmanager::Event& event)
             {
                 UI::m_ScreenManager->RecreateAllViews();

diff --git a/engine.lua b/engine.lua
@@ -65,6 +65,13 @@ project "engine"
         "MultiProcessorCompile"
     }
 
+    if USE_PULSEAUDIO then
+        defines
+        {
+            "PULSEAUDIO"
+        }
+    end
+
     filter "system:linux"
 
         linkoptions { "-fno-pie -no-pie" }
@@ -176,12 +183,6 @@ project "engine"
     include "vendor/box2d"
     include "vendor/assetImporter"
 
-    if os.host() == "linux" then
-
-        include "vendor/pamanager/libpamanager/libpamanager.lua"
-
-    end
-
     if ( (os.host() == "linux") or (os.host() == "windows" and _ACTION == "gmake2")  or (os.host() == "macosx" and _ACTION == "gmake2")) then
 
         project "resource-system-gnu"

diff --git a/engine/audio/sound.cpp b/engine/audio/sound.cpp
@@ -25,7 +25,7 @@
 
 #include "audio/sound.h"
 
-#ifdef LINUX
+#ifdef PULSEAUDIO
 
     using namespace LibPAmanager;
 

diff --git a/engine/audio/sound.h b/engine/audio/sound.h
@@ -26,7 +26,7 @@
 
 #include "engine.h"
 
-#ifdef LINUX
+#ifdef PULSEAUDIO
 
     #include "SoundDeviceManager.h"
 

diff --git a/engine/core.cpp b/engine/core.cpp
@@ -100,8 +100,8 @@ namespace GfxRenderEngine
         // init audio
         m_Audio = Audio::Create();
         m_Audio->Start();
-        #ifdef LINUX
-            Sound::SetCallback([=](const LibPAmanager::Event& event)
+        #ifdef PULSEAUDIO
+            Sound::SetCallback([this](const LibPAmanager::Event& event)
             {
                 AudioCallback((int)event.GetType());
             });
@@ -283,7 +283,7 @@ namespace GfxRenderEngine
 
     void Engine::AudioCallback(int eventType)
     {
-        #ifdef LINUX
+        #ifdef PULSEAUDIO
             switch (eventType)
             {
 

diff --git a/premake5.lua b/premake5.lua
@@ -79,6 +79,20 @@ project "lucre"
     {
     }
 
+    if os.host() == "linux" then
+        USE_PULSEAUDIO = true
+    end
+    if USE_PULSEAUDIO then
+        links
+        {
+            "libpamanager"
+        }
+        defines
+        {
+            "PULSEAUDIO"
+        }
+    end
+
     filter "system:linux"
 
         linkoptions { "-fno-pie -no-pie" }
@@ -104,7 +118,6 @@ project "lucre"
             "X11",
             "Xrandr",
             "Xi",
-            "libpamanager",
             "pulse",
             "glib-2.0",
             "gio-2.0",
@@ -261,5 +274,8 @@ project "lucre"
         print("done.")
     end
 
-    include "engine.lua"
+    if USE_PULSEAUDIO then
+        include "vendor/pamanager/libpamanager/libpamanager.lua"
+    end
 
+    include "engine.lua"