1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
|
From: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
Date: Fri, 17 Dec 2021 10:37:21 +0100
Subject: Use system-provided RtAudio
Origin: Debian
Forwarded: not-needed
Last-Update: 2022-05-04
--- giada.orig/CMakeLists.txt
+++ giada/CMakeLists.txt
@@ -442,7 +442,6 @@
src/utils/ver.h
src/utils/string.cpp
src/utils/string.h
- src/deps/rtaudio/RtAudio.cpp
src/deps/mcl-utils/src/math.hpp
src/deps/mcl-utils/src/math.cpp
src/deps/mcl-utils/src/time.hpp
@@ -541,6 +540,15 @@
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)
--- giada.orig/src/gui/elems/config/tabAudio.cpp
+++ giada/src/gui/elems/config/tabAudio.cpp
@@ -26,7 +26,7 @@
#include "src/gui/elems/config/tabAudio.h"
#include "src/deps/mcl-utils/src/string.hpp"
-#include "src/deps/rtaudio/RtAudio.h"
+#include "rtaudio/RtAudio.h"
#include "src/gui/elems/basics/box.h"
#include "src/gui/elems/basics/check.h"
#include "src/gui/elems/basics/choice.h"
@@ -480,4 +480,4 @@
m_recTriggerLevel->activate();
m_rsmpQuality->activate();
}
-} // namespace giada::v
\ No newline at end of file
+} // namespace giada::v
--- giada.orig/src/utils/ver.cpp
+++ giada/src/utils/ver.cpp
@@ -25,7 +25,7 @@
* -------------------------------------------------------------------------- */
#include "src/utils/ver.h"
-#include "src/deps/rtaudio/RtAudio.h"
+#include "rtaudio/RtAudio.h"
#include <RtMidi.h>
#include <sndfile.h>
--- giada.orig/src/core/kernelAudio.cpp
+++ giada/src/core/kernelAudio.cpp
@@ -227,7 +227,7 @@
#ifdef WITH_AUDIO_JACK
jack_client_t* KernelAudio::getJackHandle() const
{
- return static_cast<jack_client_t*>(m_rtAudio->HACK__getJackClient());
+ return nullptr;
}
#endif
--- giada.orig/src/core/const.h
+++ giada/src/core/const.h
@@ -28,7 +28,7 @@
#define G_CORE_CONST_H
#include "src/core/types.h"
-#include "src/deps/rtaudio/RtAudio.h"
+#include "rtaudio/RtAudio.h"
#include "src/types.h"
#include "src/version.h"
#include <RtMidi.h>
--- giada.orig/src/core/kernelAudio.h
+++ giada/src/core/kernelAudio.h
@@ -29,7 +29,7 @@
#include "src/core/model/model.h"
#include "src/core/weakAtomic.h"
-#include "src/deps/rtaudio/RtAudio.h"
+#include "rtaudio/RtAudio.h"
#include <cstddef>
#include <functional>
#include <memory>
--- giada.orig/src/core/model/kernelAudio.h
+++ giada/src/core/model/kernelAudio.h
@@ -29,7 +29,7 @@
#include "src/core/resampler.h"
#include "src/core/types.h"
-#include "src/deps/rtaudio/RtAudio.h"
+#include "rtaudio/RtAudio.h"
namespace giada::m::model
{
--- giada.orig/src/glue/config.cpp
+++ giada/src/glue/config.cpp
@@ -30,7 +30,7 @@
#include "src/core/kernelAudio.h"
#include "src/core/kernelMidi.h"
#include "src/deps/mcl-utils/src/vector.hpp"
-#include "src/deps/rtaudio/RtAudio.h"
+#include "rtaudio/RtAudio.h"
#include "src/gui/dialogs/browser/browserDir.h"
#include "src/gui/dialogs/config.h"
#include "src/gui/dialogs/warnings.h"
--- giada.orig/src/utils/string.h
+++ giada/src/utils/string.h
@@ -30,7 +30,7 @@
#define G_UTILS_STRING_H
#include "src/core/types.h"
-#include "src/deps/rtaudio/RtAudio.h"
+#include "rtaudio/RtAudio.h"
namespace giada::u::string
{
--- giada.orig/src/core/conf.h
+++ giada/src/core/conf.h
@@ -31,7 +31,7 @@
#include "src/core/resampler.h"
#include "src/core/types.h"
#include "src/deps/geompp/src/rect.hpp"
-#include "src/deps/rtaudio/RtAudio.h"
+#include "rtaudio/RtAudio.h"
#include "src/gui/const.h"
#include "src/types.h"
#include <FL/Enumerations.H>
|
