Browse Source

Fix for latest carla changes

Signed-off-by: falkTX <falktx@falktx.com>
develop
falkTX 6 years ago
parent
commit
859bc9803a
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 8 additions and 5 deletions
  1. +6
    -3
      zynaddsubfx-fx.cpp
  2. +2
    -2
      zynaddsubfx-synth.cpp

+ 6
- 3
zynaddsubfx-fx.cpp View File

@@ -1,6 +1,6 @@
/* /*
* Carla Native Plugins * Carla Native Plugins
* Copyright (C) 2012-2017 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2012-2019 Filipe Coelho <falktx@falktx.com>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
@@ -148,7 +148,8 @@ protected:
fEffect->cleanup(); 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]) if (outBuffer[0] != inBuffer[0])
carla_copyWithMultiply(outBuffer[0], inBuffer[0], 0.5f, frames); carla_copyWithMultiply(outBuffer[0], inBuffer[0], 0.5f, frames);
@@ -186,7 +187,9 @@ protected:
} }
} }


fEffect->out(Stereo<float*>(inBuffer[0], inBuffer[1]));
// FIXME
fEffect->out(Stereo<float*>(const_cast<float*>(inBuffer[0]),
const_cast<float*>(inBuffer[1])));


carla_addWithMultiply(outBuffer[0], efxoutl, 0.5f, frames); carla_addWithMultiply(outBuffer[0], efxoutl, 0.5f, frames);
carla_addWithMultiply(outBuffer[1], efxoutr, 0.5f, frames); carla_addWithMultiply(outBuffer[1], efxoutr, 0.5f, frames);


+ 2
- 2
zynaddsubfx-synth.cpp View File

@@ -1,6 +1,6 @@
/* /*
* Carla Native Plugins * Carla Native Plugins
* Copyright (C) 2012-2017 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2012-2019 Filipe Coelho <falktx@falktx.com>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
@@ -659,7 +659,7 @@ protected:
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Plugin process calls // 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 const NativeMidiEvent* const midiEvents, const uint32_t midiEventCount) override
{ {
if (! fMutex.tryLock()) if (! fMutex.tryLock())


Loading…
Cancel
Save