Use system-provided RtAudio

Origin: Debian
Forwarded: not-needed
Last-Update: 2022-05-04

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e66f0f1589e7e0d69aad059fb82b7371466c5ccb..f849e3852d8786eaee4779a61371a0c9b4bfcbdb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -207,7 +207,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)
@@ -297,6 +296,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 4fa059f0d0e4976e993dd1f9c581bb8087a9597d..88281d183b705b6f7f487004945eee620aacca46 100644 (file)
--- a/src/core/kernelAudio.cpp
+++ b/src/core/kernelAudio.cpp
@@ -263,7 +263,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 e509e919f626d105efaa4a9971aacd014e27c300..d0963634b511eafda7662b7a8bc96413d7abf296 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 <cstddef>
 #include <functional>
 #include <memory>

diff --git a/src/glue/config.cpp b/src/glue/config.cpp
index 258e3a9ccfc4835432a2df8a9a8e7aae76c59ac7..a9ff0adaf914f8e2c0459eb2026415e70c454e39 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"

diff --git a/src/gui/elems/config/tabAudio.cpp b/src/gui/elems/config/tabAudio.cpp
index ebe59805350071a715e1d3ea403e95217a3ef4b9..e0d9cc40021da8b058cc42b0bac261e6592e39b5 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/check.h"
 #include "gui/elems/basics/choice.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>