From a1f759bcc8e55eb65fa71a3bb5f5844c4238c480 Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 12 Jul 2019 15:46:10 +0200 Subject: [PATCH] Don't set numParams for carla as lv2 plugin, for now Fixes #885 Fixes #893 Signed-off-by: falkTX --- source/plugin/carla-lv2-export.cpp | 5 +++-- source/plugin/carla-lv2.cpp | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/source/plugin/carla-lv2-export.cpp b/source/plugin/carla-lv2-export.cpp index 621eabf0c..e2a3e8853 100644 --- a/source/plugin/carla-lv2-export.cpp +++ b/source/plugin/carla-lv2-export.cpp @@ -545,8 +545,9 @@ static void writePluginFile(const NativePluginDescriptor* const pluginDesc) // ------------------------------------------------------------------- // Parameters - const uint32_t paramCount((pluginHandle != nullptr && pluginDesc->get_parameter_count != nullptr) ? pluginDesc->get_parameter_count(pluginHandle) : 0); - + const uint32_t paramCount = (pluginHandle != nullptr && pluginDesc->get_parameter_count != nullptr) + ? pluginDesc->get_parameter_count(pluginHandle) + : 0; if (paramCount > 0) { CARLA_SAFE_ASSERT_RETURN(pluginDesc->get_parameter_info != nullptr,) diff --git a/source/plugin/carla-lv2.cpp b/source/plugin/carla-lv2.cpp index 74c0b39d1..7d3e77d84 100644 --- a/source/plugin/carla-lv2.cpp +++ b/source/plugin/carla-lv2.cpp @@ -147,7 +147,8 @@ public: if (fDescriptor->get_parameter_count != nullptr && fDescriptor->get_parameter_info != nullptr && fDescriptor->get_parameter_value != nullptr && - fDescriptor->set_parameter_value != nullptr) + fDescriptor->set_parameter_value != nullptr && + std::strncmp(fDescriptor->label, "carla", 5) != 0) { fPorts.numParams = fDescriptor->get_parameter_count(fHandle); }