From 859bc9803abc2717717b1a88e7addd50dfa1c2c9 Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 21 Mar 2019 16:35:19 +0100 Subject: [PATCH] Fix for latest carla changes Signed-off-by: falkTX --- zynaddsubfx-fx.cpp | 9 ++++++--- zynaddsubfx-synth.cpp | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/zynaddsubfx-fx.cpp b/zynaddsubfx-fx.cpp index e3824ce..b19e6c4 100644 --- a/zynaddsubfx-fx.cpp +++ b/zynaddsubfx-fx.cpp @@ -1,6 +1,6 @@ /* * Carla Native Plugins - * Copyright (C) 2012-2017 Filipe Coelho + * Copyright (C) 2012-2019 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 @@ -148,7 +148,8 @@ protected: fEffect->cleanup(); } - void process(float** const inBuffer, float** const outBuffer, const uint32_t frames, const NativeMidiEvent* const, const uint32_t) final + void process(const float** const inBuffer, float** const outBuffer, const uint32_t frames, + const NativeMidiEvent* const, const uint32_t) final { if (outBuffer[0] != inBuffer[0]) carla_copyWithMultiply(outBuffer[0], inBuffer[0], 0.5f, frames); @@ -186,7 +187,9 @@ protected: } } - fEffect->out(Stereo(inBuffer[0], inBuffer[1])); + // FIXME + fEffect->out(Stereo(const_cast(inBuffer[0]), + const_cast(inBuffer[1]))); carla_addWithMultiply(outBuffer[0], efxoutl, 0.5f, frames); carla_addWithMultiply(outBuffer[1], efxoutr, 0.5f, frames); diff --git a/zynaddsubfx-synth.cpp b/zynaddsubfx-synth.cpp index dabde86..07ece50 100644 --- a/zynaddsubfx-synth.cpp +++ b/zynaddsubfx-synth.cpp @@ -1,6 +1,6 @@ /* * Carla Native Plugins - * Copyright (C) 2012-2017 Filipe Coelho + * Copyright (C) 2012-2019 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 @@ -659,7 +659,7 @@ protected: // ------------------------------------------------------------------- // Plugin process calls - void process(float**, float** const outBuffer, const uint32_t frames, + void process(const float**, float** const outBuffer, const uint32_t frames, const NativeMidiEvent* const midiEvents, const uint32_t midiEventCount) override { if (! fMutex.tryLock())