From fa45f2a9c63800c36da8478ef2e7f676366d2098 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 21 Apr 2024 10:03:14 +0200 Subject: [PATCH] Fix build Signed-off-by: falkTX --- cmake/CMakeLists.txt | 8 +------- source/backend/engine/CarlaEngineRtAudio.cpp | 20 +++----------------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index c0a817e07..d96a20553 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -790,7 +790,6 @@ target_sources(carla-bridge-native ../source/backend/plugin/CarlaPluginAU.cpp ../source/backend/plugin/CarlaPluginCLAP.cpp ../source/backend/plugin/CarlaPluginFluidSynth.cpp - ../source/backend/plugin/CarlaPluginJuce.cpp ../source/backend/plugin/CarlaPluginJSFX.cpp ../source/backend/plugin/CarlaPluginLADSPADSSI.cpp ../source/backend/plugin/CarlaPluginLV2.cpp @@ -1021,7 +1020,6 @@ target_sources(carla-host-plugin ../source/backend/plugin/CarlaPluginAU.cpp ../source/backend/plugin/CarlaPluginCLAP.cpp ../source/backend/plugin/CarlaPluginFluidSynth.cpp - ../source/backend/plugin/CarlaPluginJuce.cpp ../source/backend/plugin/CarlaPluginJSFX.cpp ../source/backend/plugin/CarlaPluginLADSPADSSI.cpp ../source/backend/plugin/CarlaPluginLV2.cpp @@ -1122,7 +1120,6 @@ if(APPLE) -Wl,-exported_symbol,_carla_host_handle_free -Wl,-exported_symbol,_carla_get_native_plugin_engine -Wl,-exported_symbol,_carla_get_complete_license_text - -Wl,-exported_symbol,_carla_get_juce_version -Wl,-exported_symbol,_carla_get_supported_file_extensions -Wl,-exported_symbol,_carla_get_supported_features -Wl,-exported_symbol,_carla_get_library_filename @@ -1132,7 +1129,7 @@ elseif(EMSCRIPTEN) target_link_options(carla-native-plugin PRIVATE -sSIDE_MODULE=2 - -sEXPORTED_FUNCTIONS="['carla_get_native_rack_plugin','carla_get_native_patchbay_plugin','carla_get_native_patchbay16_plugin','carla_get_native_patchbay32_plugin','carla_get_native_patchbay64_plugin','carla_get_native_patchbay_cv_plugin','carla_get_native_patchbay_cv8_plugin','carla_get_native_patchbay_cv32_plugin','carla_get_native_patchbay_obs_plugin','carla_create_native_plugin_host_handle','carla_host_handle_free','carla_get_native_plugin_engine','carla_get_complete_license_text','carla_get_juce_version','carla_get_supported_file_extensions','carla_get_supported_features','carla_get_library_filename','carla_get_library_folder']" + -sEXPORTED_FUNCTIONS="['carla_get_native_rack_plugin','carla_get_native_patchbay_plugin','carla_get_native_patchbay16_plugin','carla_get_native_patchbay32_plugin','carla_get_native_patchbay64_plugin','carla_get_native_patchbay_cv_plugin','carla_get_native_patchbay_cv8_plugin','carla_get_native_patchbay_cv32_plugin','carla_get_native_patchbay_obs_plugin','carla_create_native_plugin_host_handle','carla_host_handle_free','carla_get_native_plugin_engine','carla_get_complete_license_text','carla_get_supported_file_extensions','carla_get_supported_features','carla_get_library_filename','carla_get_library_folder']" ) elseif(MSVC) target_link_options(carla-native-plugin @@ -1189,7 +1186,6 @@ target_sources(carla-native-plugin ../source/backend/plugin/CarlaPluginAU.cpp ../source/backend/plugin/CarlaPluginCLAP.cpp ../source/backend/plugin/CarlaPluginFluidSynth.cpp - ../source/backend/plugin/CarlaPluginJuce.cpp ../source/backend/plugin/CarlaPluginJSFX.cpp ../source/backend/plugin/CarlaPluginLADSPADSSI.cpp ../source/backend/plugin/CarlaPluginLV2.cpp @@ -1321,7 +1317,6 @@ target_sources(carla-standalone ../source/backend/plugin/CarlaPluginAU.cpp ../source/backend/plugin/CarlaPluginCLAP.cpp ../source/backend/plugin/CarlaPluginFluidSynth.cpp - ../source/backend/plugin/CarlaPluginJuce.cpp ../source/backend/plugin/CarlaPluginJSFX.cpp ../source/backend/plugin/CarlaPluginLADSPADSSI.cpp ../source/backend/plugin/CarlaPluginLV2.cpp @@ -1440,7 +1435,6 @@ target_sources(carla-utils ../source/backend/utils/CachedPlugins.cpp ../source/backend/utils/CarlaUtils.cpp ../source/backend/utils/Information.cpp - ../source/backend/utils/JUCE.cpp ../source/backend/utils/PipeClient.cpp ../source/backend/utils/PluginDiscovery.cpp ../source/backend/utils/System.cpp diff --git a/source/backend/engine/CarlaEngineRtAudio.cpp b/source/backend/engine/CarlaEngineRtAudio.cpp index 85f0069f9..a393e09cf 100644 --- a/source/backend/engine/CarlaEngineRtAudio.cpp +++ b/source/backend/engine/CarlaEngineRtAudio.cpp @@ -1,19 +1,5 @@ -/* - * Carla Plugin Host - * Copyright (C) 2011-2022 Filipe Coelho - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * For a full copy of the GNU General Public License see the doc/GPL.txt file. - */ +// SPDX-FileCopyrightText: 2011-2024 Filipe Coelho +// SPDX-License-Identifier: GPL-2.0-or-later #include "CarlaEngineGraph.hpp" #include "CarlaEngineInit.hpp" @@ -292,7 +278,7 @@ public: RtAudio::StreamOptions rtOptions; rtOptions.flags = RTAUDIO_SCHEDULE_REALTIME; #ifndef CARLA_OS_MAC - rtOptions.flags |= RTAUDIO_MINIMIZE_LATENCY + rtOptions.flags |= RTAUDIO_MINIMIZE_LATENCY; #endif rtOptions.numberOfBuffers = pData->options.audioTripleBuffer ? 3 : 2; rtOptions.streamName = clientName;