Use system-provided RtAudio

Origin: Debian
Forwarded: not-needed
Last-Update: 2021-08-30

Last-Update: 2021-08-30

Gbp-Pq: Name 03-system-rtaudio.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4aeb5e3b90e2b6553f2f8c6b3ac2acf56af65972..debf0616ec6fcf5590f96e4bebf68e91d05a5f6e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -201,7 +201,6 @@ list(APPEND SOURCES
        src/utils/fs.cpp
        src/utils/ver.cpp
        src/utils/string.cpp
-       src/deps/rtaudio/RtAudio.cpp
        src/deps/mcl-audio-buffer/src/audioBuffer.cpp)
 
 list(APPEND PREPROCESSOR_DEFS)
@@ -291,6 +290,15 @@ elseif (PkgConfig_FOUND)
        endif()
 endif()
 
+if (PkgConfig_FOUND)
+       pkg_check_modules(RtAudio IMPORTED_TARGET rtaudio)
+       if (RtAudio_FOUND)
+               list(APPEND LIBRARIES PkgConfig::RtAudio)
+               message("RtAudio library found")
+       endif()
+endif()
+
+
 if (NOT RtMidi_FOUND)
        # Fallback to find_library mode (in case rtmidi is too old). 
        find_library(LIBRARY_RTMIDI NAMES rtmidi)

diff --git a/src/core/kernelAudio.cpp b/src/core/kernelAudio.cpp
index 8c10d8e0abdb614c7ffe7cf5396e533419b08be9..748bf5dea9044d7a7b22519d9f58fe8d3c8f865d 100644 (file)
--- a/src/core/kernelAudio.cpp
+++ b/src/core/kernelAudio.cpp
@@ -262,7 +262,7 @@ const std::vector<m::KernelAudio::Device>& KernelAudio::getDevices() const
 #ifdef WITH_AUDIO_JACK
 jack_client_t* KernelAudio::getJackHandle() const
 {
-       return static_cast<jack_client_t*>(m_rtAudio->HACK__getJackClient());
+       return nullptr;
 }
 #endif
 

diff --git a/src/core/kernelAudio.h b/src/core/kernelAudio.h
index ce3c57bdf86e0742c81d810b3ec3d6e905bf96c9..c1d9d235f1ed7122ea46bf821bf68055507f0d70 100644 (file)
--- a/src/core/kernelAudio.h
+++ b/src/core/kernelAudio.h
@@ -28,7 +28,7 @@
 #define G_KERNELAUDIO_H
 
 #include "core/conf.h"
-#include "deps/rtaudio/RtAudio.h"
+#include "rtaudio/RtAudio.h"
 #include <functional>
 #include <memory>
 #include <string>

diff --git a/src/glue/config.cpp b/src/glue/config.cpp
index 8a962ead32cc8a95614f8a9816484bd3df7a2c64..693991d2d156c8128ad6f3271e728a0f7e96f88e 100644 (file)
--- a/src/glue/config.cpp
+++ b/src/glue/config.cpp
@@ -32,7 +32,7 @@
 #include "core/kernelMidi.h"
 #include "core/midiMapper.h"
 #include "core/plugins/pluginManager.h"
-#include "deps/rtaudio/RtAudio.h"
+#include "rtaudio/RtAudio.h"
 #include "gui/dialogs/browser/browserDir.h"
 #include "gui/dialogs/config.h"
 #include "gui/dialogs/warnings.h"
@@ -328,4 +328,4 @@ void setPluginPathCb(void* data)
        configWin->tabPlugins->rebuild();
 }
 #endif
-} // namespace giada::c::config
\ No newline at end of file
+} // namespace giada::c::config

diff --git a/src/gui/elems/config/tabAudio.cpp b/src/gui/elems/config/tabAudio.cpp
index 7894597ab26a849ada586fa10a24630e9207037b..ff18e179433c5007b1c9bfb88024af7ed87f746f 100644 (file)
--- a/src/gui/elems/config/tabAudio.cpp
+++ b/src/gui/elems/config/tabAudio.cpp
@@ -27,7 +27,7 @@
 #include "tabAudio.h"
 #include "core/const.h"
 #include "core/kernelAudio.h"
-#include "deps/rtaudio/RtAudio.h"
+#include "rtaudio/RtAudio.h"
 #include "gui/elems/basics/box.h"
 #include "gui/elems/basics/button.h"
 #include "gui/elems/basics/check.h"

diff --git a/src/utils/ver.cpp b/src/utils/ver.cpp
index a4c04700f0612aca85205a3600c76f5ea8b17db0..2c45df358094388d35e35d2d5fe90ecd904a05ea 100644 (file)
--- a/src/utils/ver.cpp
+++ b/src/utils/ver.cpp
@@ -26,7 +26,7 @@
 
 #include "ver.h"
 #include "core/const.h"
-#include "deps/rtaudio/RtAudio.h"
+#include "rtaudio/RtAudio.h"
 #include <RtMidi.h>
 #include <sndfile.h>