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 0c4427eee93fdec60dc802fa8b0a7904e2680ac6..cbd2878a6170646b32bf2550ab247c0764d47ec3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -196,7 +196,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)
@@ -286,6 +285,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)
@@ -581,4 +589,4 @@ elseif(DEFINED OS_MACOS)
        set_target_properties(giada PROPERTIES
                XCODE_ATTRIBUTE_ENABLE_HARDENED_RUNTIME YES)
 
-endif()
\ No newline at end of file
+endif()

diff --git a/src/core/kernelAudio.cpp b/src/core/kernelAudio.cpp
index 4a52d8806a25060280d89b9513ff004c87e38cc8..089ef5487e28801a6cd9d0151c58cc0ab12680f7 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 706d662f76080ad3d66cf03785b19bb206473495..1eddf0d47ba11ebe400e8c31cc55a5a66d61c7c5 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 088d0f7210c690cacf5cdcced313437525a838f1..129b10599c53ee140dd309786908092d4a7fcfb3 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 8539215580688c7c074dca79dc4855efba992ed9..7a02eec7e844c798eb5c3e0d7979b5a1d4487a80 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 449b763ae12c50c22252ca9c769d73bb764e1953..4129bbc6ef3806169290054dc6721c0c15951cdc 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>