From de84baeefb65504f9cb628155ed95248eb9292e4 Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 21 Apr 2020 10:59:06 +0100 Subject: [PATCH] Do not use JUCE for vst2 handling, for now Signed-off-by: falkTX --- source/backend/plugin/CarlaPluginJuce.cpp | 2 +- source/backend/plugin/CarlaPluginVST2.cpp | 4 ++-- source/modules/AppConfig.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/backend/plugin/CarlaPluginJuce.cpp b/source/backend/plugin/CarlaPluginJuce.cpp index 74548ccaa..99426b2ec 100644 --- a/source/backend/plugin/CarlaPluginJuce.cpp +++ b/source/backend/plugin/CarlaPluginJuce.cpp @@ -18,7 +18,7 @@ #include "CarlaPluginInternal.hpp" #include "CarlaEngine.hpp" -#if defined(USING_JUCE) +#ifdef USING_JUCE #include "CarlaBackendUtils.hpp" #include "CarlaMathUtils.hpp" diff --git a/source/backend/plugin/CarlaPluginVST2.cpp b/source/backend/plugin/CarlaPluginVST2.cpp index 9a79c28c6..52d16ee42 100644 --- a/source/backend/plugin/CarlaPluginVST2.cpp +++ b/source/backend/plugin/CarlaPluginVST2.cpp @@ -1,6 +1,6 @@ /* * Carla VST Plugin - * Copyright (C) 2011-2019 Filipe Coelho + * Copyright (C) 2011-2020 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 @@ -18,7 +18,7 @@ #include "CarlaPluginInternal.hpp" #include "CarlaEngine.hpp" -#if defined(USING_JUCE) && (defined(CARLA_OS_MAC) || defined(CARLA_OS_WIN)) +#if defined(USING_JUCE) && JUCE_PLUGINHOST_VST # define USE_JUCE_FOR_VST2 #endif diff --git a/source/modules/AppConfig.h b/source/modules/AppConfig.h index 20902d58b..046c59dfe 100644 --- a/source/modules/AppConfig.h +++ b/source/modules/AppConfig.h @@ -1,6 +1,6 @@ /* * Carla Plugin Host - * Copyright (C) 2011-2019 Filipe Coelho + * Copyright (C) 2011-2020 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 @@ -216,7 +216,7 @@ @see VSTPluginFormat, AudioPluginFormat, AudioPluginFormatManager, JUCE_PLUGINHOST_AU */ #if defined(APPCONFIG_OS_MAC) || defined(APPCONFIG_OS_WIN) -# define JUCE_PLUGINHOST_VST 1 +# define JUCE_PLUGINHOST_VST 0 /* FIXME use old juce vst2 code or vestige */ #else # define JUCE_PLUGINHOST_VST 0 #endif