diff --git a/examples/DemoRunner/Builds/Android/app/CMakeLists.txt b/examples/DemoRunner/Builds/Android/app/CMakeLists.txt index 3f4505aaab..41aaedfb3f 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" @@ -3062,7 +3062,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 089492e7a0..a35c4c73ec 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 78ecdc6f4b..7ba92fe15a 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 c21ffb9ec6..eec603f4e9 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 bbd6402c99..99a67af9b6 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 7a9ac8fb86..b414a53468 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" @@ -2631,7 +2631,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 f303fbc027..b6de45cc5f 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 461cd2c8b5..87f690df00 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 7a4bf66976..f4b792d169 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" @@ -2817,7 +2817,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 18e32c1449..c065068bc7 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 cace5e2a16..fde929b00e 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 6efd551261..dfdfdfaa85 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 c8ae1c046f..4c232094a5 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 c972167c14..635156e4ec 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" @@ -2715,7 +2715,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 a5cf67a670..e1e54beced 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 cbcff54ef1..f46478fb12 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 23f142977e..0724ed3cc3 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 eff9a6f07b..6f29ece00e 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 9638f038fc..9a04131577 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 bc2959cb8f..76257d6851 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 b2908c8e55..9d55e2153e 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 80a4e27c78..57530ca870 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