From 85ce98412efbe4d113a04e320409e17433a04e17 Mon Sep 17 00:00:00 2001
From: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
Date: Fri, 17 Dec 2021 10:37:21 +0100
Subject: [PATCH] Use system-provided RtAudio

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


Gbp-Pq: Name 03-system-rtaudio.patch
---
 CMakeLists.txt                    | 10 +++++++++-
 src/core/kernelAudio.cpp          |  2 +-
 src/core/kernelAudio.h            |  2 +-
 src/glue/config.cpp               |  2 +-
 src/gui/elems/config/tabAudio.cpp |  2 +-
 src/utils/ver.cpp                 |  2 +-
 6 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ec69d1..db418f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -204,7 +204,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)
@@ -294,6 +293,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 4fa059f..88281d1 100644
--- 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 e509e91..d096363 100644
--- 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 db2c926..810f9b3 100644
--- 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 aaac8de..06269f0 100644
--- 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 a4c0470..2c45df3 100644
--- 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>
 
-- 
2.30.2