From a99bff1e1d1994bb6cfe45ff9fec5294a47a708b Mon Sep 17 00:00:00 2001 From: reuk Date: Wed, 25 Jun 2025 18:46:00 +0100 Subject: [PATCH] JACK: Fix build failure on Linux when JUCE_JACK=1 --- .../DemoRunner/Builds/Android/app/CMakeLists.txt | 4 ++-- .../Builds/VisualStudio2019/DemoRunner_App.vcxproj | 2 +- .../DemoRunner_App.vcxproj.filters | 2 +- .../Builds/VisualStudio2022/DemoRunner_App.vcxproj | 2 +- .../DemoRunner_App.vcxproj.filters | 2 +- .../Builds/Android/app/CMakeLists.txt | 4 ++-- .../AudioPerformanceTest_App.vcxproj | 2 +- .../AudioPerformanceTest_App.vcxproj.filters | 2 +- .../Builds/Android/app/CMakeLists.txt | 4 ++-- .../VisualStudio2019/AudioPluginHost_App.vcxproj | 2 +- .../AudioPluginHost_App.vcxproj.filters | 2 +- .../VisualStudio2022/AudioPluginHost_App.vcxproj | 2 +- .../AudioPluginHost_App.vcxproj.filters | 2 +- .../Builds/Android/app/CMakeLists.txt | 4 ++-- .../NetworkGraphicsDemo_App.vcxproj | 2 +- .../NetworkGraphicsDemo_App.vcxproj.filters | 2 +- .../UnitTestRunner_ConsoleApp.vcxproj | 2 +- .../UnitTestRunner_ConsoleApp.vcxproj.filters | 2 +- .../UnitTestRunner_ConsoleApp.vcxproj | 2 +- .../UnitTestRunner_ConsoleApp.vcxproj.filters | 2 +- .../WindowsDLL_DynamicLibrary.vcxproj | 2 +- .../WindowsDLL_DynamicLibrary.vcxproj.filters | 2 +- modules/juce_audio_devices/juce_audio_devices.cpp | 14 -------------- ...juce_JackAudio_linux.cpp => juce_JackAudio.cpp} | 0 24 files changed, 26 insertions(+), 40 deletions(-) rename modules/juce_audio_devices/native/{juce_JackAudio_linux.cpp => juce_JackAudio.cpp} (100%) diff --git a/examples/DemoRunner/Builds/Android/app/CMakeLists.txt b/examples/DemoRunner/Builds/Android/app/CMakeLists.txt index a1db087f16..a42c2c84f7 100644 --- a/examples/DemoRunner/Builds/Android/app/CMakeLists.txt +++ b/examples/DemoRunner/Builds/Android/app/CMakeLists.txt @@ -379,7 +379,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_audio_devices/native/juce_CoreMidi_mac.mm" "../../../../../modules/juce_audio_devices/native/juce_DirectSound_windows.cpp" "../../../../../modules/juce_audio_devices/native/juce_HighPerformanceAudioHelpers_android.h" - "../../../../../modules/juce_audio_devices/native/juce_JackAudio_linux.cpp" + "../../../../../modules/juce_audio_devices/native/juce_JackAudio.cpp" "../../../../../modules/juce_audio_devices/native/juce_Midi_android.cpp" "../../../../../modules/juce_audio_devices/native/juce_Midi_linux.cpp" "../../../../../modules/juce_audio_devices/native/juce_Midi_windows.cpp" @@ -3065,7 +3065,7 @@ set_source_files_properties( "../../../../../modules/juce_audio_devices/native/juce_CoreMidi_mac.mm" "../../../../../modules/juce_audio_devices/native/juce_DirectSound_windows.cpp" "../../../../../modules/juce_audio_devices/native/juce_HighPerformanceAudioHelpers_android.h" - "../../../../../modules/juce_audio_devices/native/juce_JackAudio_linux.cpp" + "../../../../../modules/juce_audio_devices/native/juce_JackAudio.cpp" "../../../../../modules/juce_audio_devices/native/juce_Midi_android.cpp" "../../../../../modules/juce_audio_devices/native/juce_Midi_linux.cpp" "../../../../../modules/juce_audio_devices/native/juce_Midi_windows.cpp" diff --git a/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj b/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj index eaddb790e8..c172a3161c 100644 --- a/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj +++ b/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj @@ -579,7 +579,7 @@ true - + true diff --git a/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters b/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters index f82b67d680..b3f42ca2b0 100644 --- a/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters +++ b/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters @@ -1270,7 +1270,7 @@ JUCE Modules\juce_audio_devices\native - + JUCE Modules\juce_audio_devices\native diff --git a/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj b/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj index f4e3773667..de00024908 100644 --- a/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj +++ b/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj @@ -579,7 +579,7 @@ true - + true diff --git a/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj.filters b/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj.filters index 22c2ac6d48..4d2d867579 100644 --- a/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj.filters +++ b/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj.filters @@ -1270,7 +1270,7 @@ JUCE Modules\juce_audio_devices\native - + JUCE Modules\juce_audio_devices\native diff --git a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt index 581dac87d6..2d5498015b 100644 --- a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt +++ b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt @@ -334,7 +334,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_audio_devices/native/juce_CoreMidi_mac.mm" "../../../../../modules/juce_audio_devices/native/juce_DirectSound_windows.cpp" "../../../../../modules/juce_audio_devices/native/juce_HighPerformanceAudioHelpers_android.h" - "../../../../../modules/juce_audio_devices/native/juce_JackAudio_linux.cpp" + "../../../../../modules/juce_audio_devices/native/juce_JackAudio.cpp" "../../../../../modules/juce_audio_devices/native/juce_Midi_android.cpp" "../../../../../modules/juce_audio_devices/native/juce_Midi_linux.cpp" "../../../../../modules/juce_audio_devices/native/juce_Midi_windows.cpp" @@ -2634,7 +2634,7 @@ set_source_files_properties( "../../../../../modules/juce_audio_devices/native/juce_CoreMidi_mac.mm" "../../../../../modules/juce_audio_devices/native/juce_DirectSound_windows.cpp" "../../../../../modules/juce_audio_devices/native/juce_HighPerformanceAudioHelpers_android.h" - "../../../../../modules/juce_audio_devices/native/juce_JackAudio_linux.cpp" + "../../../../../modules/juce_audio_devices/native/juce_JackAudio.cpp" "../../../../../modules/juce_audio_devices/native/juce_Midi_android.cpp" "../../../../../modules/juce_audio_devices/native/juce_Midi_linux.cpp" "../../../../../modules/juce_audio_devices/native/juce_Midi_windows.cpp" diff --git a/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj b/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj index c634f6a293..e1ab9159db 100644 --- a/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj +++ b/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj @@ -537,7 +537,7 @@ true - + true diff --git a/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj.filters b/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj.filters index e4559b715c..7fb775d454 100644 --- a/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj.filters +++ b/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj.filters @@ -1051,7 +1051,7 @@ JUCE Modules\juce_audio_devices\native - + JUCE Modules\juce_audio_devices\native diff --git a/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt b/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt index e1229592f2..a6b97ff927 100644 --- a/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt +++ b/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt @@ -367,7 +367,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_audio_devices/native/juce_CoreMidi_mac.mm" "../../../../../modules/juce_audio_devices/native/juce_DirectSound_windows.cpp" "../../../../../modules/juce_audio_devices/native/juce_HighPerformanceAudioHelpers_android.h" - "../../../../../modules/juce_audio_devices/native/juce_JackAudio_linux.cpp" + "../../../../../modules/juce_audio_devices/native/juce_JackAudio.cpp" "../../../../../modules/juce_audio_devices/native/juce_Midi_android.cpp" "../../../../../modules/juce_audio_devices/native/juce_Midi_linux.cpp" "../../../../../modules/juce_audio_devices/native/juce_Midi_windows.cpp" @@ -2820,7 +2820,7 @@ set_source_files_properties( "../../../../../modules/juce_audio_devices/native/juce_CoreMidi_mac.mm" "../../../../../modules/juce_audio_devices/native/juce_DirectSound_windows.cpp" "../../../../../modules/juce_audio_devices/native/juce_HighPerformanceAudioHelpers_android.h" - "../../../../../modules/juce_audio_devices/native/juce_JackAudio_linux.cpp" + "../../../../../modules/juce_audio_devices/native/juce_JackAudio.cpp" "../../../../../modules/juce_audio_devices/native/juce_Midi_android.cpp" "../../../../../modules/juce_audio_devices/native/juce_Midi_linux.cpp" "../../../../../modules/juce_audio_devices/native/juce_Midi_windows.cpp" diff --git a/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj b/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj index 4e9a345265..4d0999517d 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj +++ b/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj @@ -545,7 +545,7 @@ true - + true diff --git a/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters b/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters index 3786b0a7ae..4bf0c062ba 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters +++ b/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters @@ -1126,7 +1126,7 @@ JUCE Modules\juce_audio_devices\native - + JUCE Modules\juce_audio_devices\native diff --git a/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj b/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj index d12bbcb1ac..60671a916b 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj +++ b/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj @@ -545,7 +545,7 @@ true - + true diff --git a/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj.filters b/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj.filters index e455e17612..f1db0a3b53 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj.filters +++ b/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj.filters @@ -1126,7 +1126,7 @@ JUCE Modules\juce_audio_devices\native - + JUCE Modules\juce_audio_devices\native diff --git a/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt b/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt index a3a004a8ea..97d412db4a 100644 --- a/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt +++ b/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt @@ -338,7 +338,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_audio_devices/native/juce_CoreMidi_mac.mm" "../../../../../modules/juce_audio_devices/native/juce_DirectSound_windows.cpp" "../../../../../modules/juce_audio_devices/native/juce_HighPerformanceAudioHelpers_android.h" - "../../../../../modules/juce_audio_devices/native/juce_JackAudio_linux.cpp" + "../../../../../modules/juce_audio_devices/native/juce_JackAudio.cpp" "../../../../../modules/juce_audio_devices/native/juce_Midi_android.cpp" "../../../../../modules/juce_audio_devices/native/juce_Midi_linux.cpp" "../../../../../modules/juce_audio_devices/native/juce_Midi_windows.cpp" @@ -2718,7 +2718,7 @@ set_source_files_properties( "../../../../../modules/juce_audio_devices/native/juce_CoreMidi_mac.mm" "../../../../../modules/juce_audio_devices/native/juce_DirectSound_windows.cpp" "../../../../../modules/juce_audio_devices/native/juce_HighPerformanceAudioHelpers_android.h" - "../../../../../modules/juce_audio_devices/native/juce_JackAudio_linux.cpp" + "../../../../../modules/juce_audio_devices/native/juce_JackAudio.cpp" "../../../../../modules/juce_audio_devices/native/juce_Midi_android.cpp" "../../../../../modules/juce_audio_devices/native/juce_Midi_linux.cpp" "../../../../../modules/juce_audio_devices/native/juce_Midi_windows.cpp" diff --git a/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj b/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj index 49f25aade1..42c7fb20af 100644 --- a/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj +++ b/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj @@ -537,7 +537,7 @@ true - + true diff --git a/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj.filters b/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj.filters index bbf625eb3d..d8464040c8 100644 --- a/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj.filters +++ b/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj.filters @@ -1081,7 +1081,7 @@ JUCE Modules\juce_audio_devices\native - + JUCE Modules\juce_audio_devices\native diff --git a/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj b/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj index 592afd2ca8..b7ebc81939 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj +++ b/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj @@ -553,7 +553,7 @@ true - + true diff --git a/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj.filters b/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj.filters index cd68d73a44..7e41e44560 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj.filters +++ b/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj.filters @@ -1174,7 +1174,7 @@ JUCE Modules\juce_audio_devices\native - + JUCE Modules\juce_audio_devices\native diff --git a/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj b/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj index 18636d335f..a64b82cf8d 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj +++ b/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj @@ -553,7 +553,7 @@ true - + true diff --git a/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj.filters b/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj.filters index c614d58a95..26816c46b2 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj.filters +++ b/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj.filters @@ -1174,7 +1174,7 @@ JUCE Modules\juce_audio_devices\native - + JUCE Modules\juce_audio_devices\native diff --git a/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj b/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj index 39c42ddf03..81f5ec3193 100644 --- a/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj +++ b/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj @@ -536,7 +536,7 @@ true - + true diff --git a/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj.filters b/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj.filters index 318f6384ea..89f0ccaa87 100644 --- a/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj.filters +++ b/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj.filters @@ -1078,7 +1078,7 @@ JUCE Modules\juce_audio_devices\native - + JUCE Modules\juce_audio_devices\native diff --git a/modules/juce_audio_devices/juce_audio_devices.cpp b/modules/juce_audio_devices/juce_audio_devices.cpp index 2afb980525..95560cb39a 100644 --- a/modules/juce_audio_devices/juce_audio_devices.cpp +++ b/modules/juce_audio_devices/juce_audio_devices.cpp @@ -176,20 +176,6 @@ #include "native/juce_ALSA_weak_linux.h" #include "native/juce_ALSA_linux.cpp" #endif - - #if JUCE_JACK - /* Got an include error here? If so, you've either not got jack-audio-connection-kit - installed, or you've not got your paths set up correctly to find its header files. - - The package you need to install to get JACK support is "libjack-dev". - - If you don't have the jack-audio-connection-kit library and don't want to build - JUCE with low latency audio support, just set the JUCE_JACK flag to 0. - */ - #include - #include "native/juce_JackAudio_linux.cpp" - #endif - #undef SIZEOF //============================================================================== diff --git a/modules/juce_audio_devices/native/juce_JackAudio_linux.cpp b/modules/juce_audio_devices/native/juce_JackAudio.cpp similarity index 100% rename from modules/juce_audio_devices/native/juce_JackAudio_linux.cpp rename to modules/juce_audio_devices/native/juce_JackAudio.cpp