@@ -1080,7 +1080,7 @@ protected: | |||||
//runPendingRtEvents(); | //runPendingRtEvents(); | ||||
} | } | ||||
void process(const float** const inBuffer, float** const outBuffer, const uint32_t frames, | |||||
void process(const float* const* const inBuffer, float** const outBuffer, const uint32_t frames, | |||||
const NativeMidiEvent* const midiEvents, const uint32_t midiEventCount) | const NativeMidiEvent* const midiEvents, const uint32_t midiEventCount) | ||||
{ | { | ||||
if (frames > pData->bufferSize) | if (frames > pData->bufferSize) | ||||
@@ -1577,8 +1577,9 @@ public: | |||||
handlePtr->deactivate(); | handlePtr->deactivate(); | ||||
} | } | ||||
// FIXME for v3.0, use const for the input buffer | |||||
static void _process(NativePluginHandle handle, | static void _process(NativePluginHandle handle, | ||||
const float** inBuffer, float** outBuffer, const uint32_t frames, | |||||
float** inBuffer, float** outBuffer, const uint32_t frames, | |||||
const NativeMidiEvent* midiEvents, uint32_t midiEventCount) | const NativeMidiEvent* midiEvents, uint32_t midiEventCount) | ||||
{ | { | ||||
handlePtr->process(inBuffer, outBuffer, frames, midiEvents, midiEventCount); | handlePtr->process(inBuffer, outBuffer, frames, midiEvents, midiEventCount); | ||||
@@ -2283,18 +2283,18 @@ public: | |||||
if (fHandle2 == nullptr) | if (fHandle2 == nullptr) | ||||
{ | { | ||||
fDescriptor->process(fHandle, | fDescriptor->process(fHandle, | ||||
const_cast<const float**>(fAudioAndCvInBuffers), fAudioAndCvOutBuffers, frames, | |||||
fAudioAndCvInBuffers, fAudioAndCvOutBuffers, frames, | |||||
fMidiInEvents, fMidiEventInCount); | fMidiInEvents, fMidiEventInCount); | ||||
} | } | ||||
else | else | ||||
{ | { | ||||
fDescriptor->process(fHandle, | fDescriptor->process(fHandle, | ||||
(fAudioAndCvInBuffers != nullptr) ? const_cast<const float**>(&fAudioAndCvInBuffers[0]) : nullptr, | |||||
(fAudioAndCvInBuffers != nullptr) ? &fAudioAndCvInBuffers[0] : nullptr, | |||||
(fAudioAndCvOutBuffers != nullptr) ? &fAudioAndCvOutBuffers[0] : nullptr, | (fAudioAndCvOutBuffers != nullptr) ? &fAudioAndCvOutBuffers[0] : nullptr, | ||||
frames, fMidiInEvents, fMidiEventInCount); | frames, fMidiInEvents, fMidiEventInCount); | ||||
fDescriptor->process(fHandle2, | fDescriptor->process(fHandle2, | ||||
(fAudioAndCvInBuffers != nullptr) ? const_cast<const float**>(&fAudioAndCvInBuffers[1]) : nullptr, | |||||
(fAudioAndCvInBuffers != nullptr) ? &fAudioAndCvInBuffers[1] : nullptr, | |||||
(fAudioAndCvOutBuffers != nullptr) ? &fAudioAndCvOutBuffers[1] : nullptr, | (fAudioAndCvOutBuffers != nullptr) ? &fAudioAndCvOutBuffers[1] : nullptr, | ||||
frames, fMidiInEvents, fMidiEventInCount); | frames, fMidiInEvents, fMidiEventInCount); | ||||
} | } | ||||
@@ -263,8 +263,10 @@ typedef struct _NativePluginDescriptor { | |||||
void (*activate)(NativePluginHandle handle); | void (*activate)(NativePluginHandle handle); | ||||
void (*deactivate)(NativePluginHandle handle); | void (*deactivate)(NativePluginHandle handle); | ||||
// FIXME for v3.0, use const for the input buffer | |||||
void (*process)(NativePluginHandle handle, | void (*process)(NativePluginHandle handle, | ||||
const float** inBuffer, float** outBuffer, uint32_t frames, | |||||
float** inBuffer, float** outBuffer, uint32_t frames, | |||||
const NativeMidiEvent* midiEvents, uint32_t midiEventCount); | const NativeMidiEvent* midiEvents, uint32_t midiEventCount); | ||||
char* (*get_state)(NativePluginHandle handle); | char* (*get_state)(NativePluginHandle handle); | ||||
@@ -318,7 +318,7 @@ protected: | |||||
virtual void deactivate() {} | virtual void deactivate() {} | ||||
virtual void process(const float** inBuffer, float** outBuffer, uint32_t frames, | |||||
virtual void process(const float* const* inBuffer, float** outBuffer, uint32_t frames, | |||||
const NativeMidiEvent* midiEvents, uint32_t midiEventCount) = 0; | const NativeMidiEvent* midiEvents, uint32_t midiEventCount) = 0; | ||||
// ------------------------------------------------------------------- | // ------------------------------------------------------------------- | ||||
@@ -500,8 +500,9 @@ public: | |||||
handlePtr->deactivate(); | handlePtr->deactivate(); | ||||
} | } | ||||
// FIXME for v3.0, use const for the input buffer | |||||
static void _process(NativePluginHandle handle, | static void _process(NativePluginHandle handle, | ||||
const float** inBuffer, float** outBuffer, const uint32_t frames, | |||||
float** inBuffer, float** outBuffer, const uint32_t frames, | |||||
const NativeMidiEvent* midiEvents, uint32_t midiEventCount) | const NativeMidiEvent* midiEvents, uint32_t midiEventCount) | ||||
{ | { | ||||
handlePtr->process(inBuffer, outBuffer, frames, midiEvents, midiEventCount); | handlePtr->process(inBuffer, outBuffer, frames, midiEvents, midiEventCount); | ||||
@@ -102,7 +102,7 @@ protected: | |||||
// New Plugin program calls | // New Plugin program calls | ||||
virtual void setStateFromFile(const char* filename) = 0; | virtual void setStateFromFile(const char* filename) = 0; | ||||
virtual void process2(const float** inBuffer, float** outBuffer, uint32_t frames, | |||||
virtual void process2(const float* const* inBuffer, float** outBuffer, uint32_t frames, | |||||
const NativeMidiEvent* midiEvents, uint32_t midiEventCount) = 0; | const NativeMidiEvent* midiEvents, uint32_t midiEventCount) = 0; | ||||
// ------------------------------------------------------------------- | // ------------------------------------------------------------------- | ||||
@@ -158,7 +158,7 @@ protected: | |||||
// ------------------------------------------------------------------- | // ------------------------------------------------------------------- | ||||
// Plugin process calls | // Plugin process calls | ||||
void process(const float** const inBuffer, float** const outBuffer, uint32_t frames, | |||||
void process(const float* const* const inBuffer, float** const outBuffer, uint32_t frames, | |||||
const NativeMidiEvent* const midiEvents, const uint32_t midiEventCount) override | const NativeMidiEvent* const midiEvents, const uint32_t midiEventCount) override | ||||
{ | { | ||||
const CarlaMutexTryLocker cmtl(fProgramChangeMutex, isOffline()); | const CarlaMutexTryLocker cmtl(fProgramChangeMutex, isOffline()); | ||||
@@ -845,14 +845,14 @@ protected: | |||||
Run/process function for plugins with MIDI input. | Run/process function for plugins with MIDI input. | ||||
@note Some parameters might be null if there are no audio inputs/outputs or MIDI events. | @note Some parameters might be null if there are no audio inputs/outputs or MIDI events. | ||||
*/ | */ | ||||
virtual void run(const float** inputs, float** outputs, uint32_t frames, | |||||
virtual void run(const float* const* inputs, float** outputs, uint32_t frames, | |||||
const MidiEvent* midiEvents, uint32_t midiEventCount) = 0; | const MidiEvent* midiEvents, uint32_t midiEventCount) = 0; | ||||
#else | #else | ||||
/** | /** | ||||
Run/process function for plugins without MIDI input. | Run/process function for plugins without MIDI input. | ||||
@note Some parameters might be null if there are no audio inputs or outputs. | @note Some parameters might be null if there are no audio inputs or outputs. | ||||
*/ | */ | ||||
virtual void run(const float** inputs, float** outputs, uint32_t frames) = 0; | |||||
virtual void run(const float* const* inputs, float** outputs, uint32_t frames) = 0; | |||||
#endif | #endif | ||||
/* -------------------------------------------------------------------------------------------------------- | /* -------------------------------------------------------------------------------------------------------- | ||||
@@ -364,7 +364,7 @@ protected: | |||||
} | } | ||||
#if DISTRHO_PLUGIN_WANT_MIDI_INPUT | #if DISTRHO_PLUGIN_WANT_MIDI_INPUT | ||||
void process(const float** const inBuffer, float** const outBuffer, const uint32_t frames, | |||||
void process(const float* const* const inBuffer, 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 | ||||
{ | { | ||||
MidiEvent realMidiEvents[midiEventCount]; | MidiEvent realMidiEvents[midiEventCount]; | ||||
@@ -389,7 +389,7 @@ protected: | |||||
fPlugin.run(inBuffer, outBuffer, frames, realMidiEvents, midiEventCount); | fPlugin.run(inBuffer, outBuffer, frames, realMidiEvents, midiEventCount); | ||||
} | } | ||||
#else | #else | ||||
void process(const float** const inBuffer, float** const outBuffer, const uint32_t frames, | |||||
void process(const float* const* const inBuffer, float** const outBuffer, const uint32_t frames, | |||||
const NativeMidiEvent* const, const uint32_t) override | const NativeMidiEvent* const, const uint32_t) override | ||||
{ | { | ||||
fPlugin.run(inBuffer, outBuffer, frames); | fPlugin.run(inBuffer, outBuffer, frames); | ||||
@@ -552,7 +552,7 @@ public: | |||||
} | } | ||||
#if DISTRHO_PLUGIN_WANT_MIDI_INPUT | #if DISTRHO_PLUGIN_WANT_MIDI_INPUT | ||||
void run(const float** const inputs, float** const outputs, const uint32_t frames, | |||||
void run(const float* const* const inputs, float** const outputs, const uint32_t frames, | |||||
const MidiEvent* const midiEvents, const uint32_t midiEventCount) | const MidiEvent* const midiEvents, const uint32_t midiEventCount) | ||||
{ | { | ||||
DISTRHO_SAFE_ASSERT_RETURN(fData != nullptr,); | DISTRHO_SAFE_ASSERT_RETURN(fData != nullptr,); | ||||
@@ -569,7 +569,7 @@ public: | |||||
fData->isProcessing = false; | fData->isProcessing = false; | ||||
} | } | ||||
#else | #else | ||||
void run(const float** const inputs, float** const outputs, const uint32_t frames) | |||||
void run(const float* const* const inputs, float** const outputs, const uint32_t frames) | |||||
{ | { | ||||
DISTRHO_SAFE_ASSERT_RETURN(fData != nullptr,); | DISTRHO_SAFE_ASSERT_RETURN(fData != nullptr,); | ||||
DISTRHO_SAFE_ASSERT_RETURN(fPlugin != nullptr,); | DISTRHO_SAFE_ASSERT_RETURN(fPlugin != nullptr,); | ||||
@@ -153,7 +153,7 @@ protected: | |||||
// ------------------------------------------------------------------- | // ------------------------------------------------------------------- | ||||
// Plugin process calls | // Plugin process calls | ||||
void process2(const float**, float** const outBuffer, const uint32_t frames, | |||||
void process2(const float* const*, float** const outBuffer, const uint32_t frames, | |||||
const NativeMidiEvent*, uint32_t) override | const NativeMidiEvent*, uint32_t) override | ||||
{ | { | ||||
const NativeTimeInfo* const timePos(getTimeInfo()); | const NativeTimeInfo* const timePos(getTimeInfo()); | ||||
@@ -201,8 +201,9 @@ void handle_audio_buffers(const float* inBuffer, float* outBuffer, Filter* const | |||||
filter->z1 = z1; | filter->z1 = z1; | ||||
} | } | ||||
// FIXME for v3.0, use const for the input buffer | |||||
static void audiogain_process(NativePluginHandle handle, | static void audiogain_process(NativePluginHandle handle, | ||||
const float** inBuffer, float** outBuffer, uint32_t frames, | |||||
float** inBuffer, float** outBuffer, uint32_t frames, | |||||
const NativeMidiEvent* midiEvents, uint32_t midiEventCount) | const NativeMidiEvent* midiEvents, uint32_t midiEventCount) | ||||
{ | { | ||||
const float gain = handlePtr->gain; | const float gain = handlePtr->gain; | ||||
@@ -155,7 +155,7 @@ protected: | |||||
fOutRight = 0.0f; | fOutRight = 0.0f; | ||||
} | } | ||||
void process(const float** inputs, float**, const uint32_t frames, | |||||
void process(const float* const* inputs, float**, const uint32_t frames, | |||||
const NativeMidiEvent* const, const uint32_t) override | const NativeMidiEvent* const, const uint32_t) override | ||||
{ | { | ||||
fOutLeft = carla_findMaxNormalizedFloat(inputs[0], frames); | fOutLeft = carla_findMaxNormalizedFloat(inputs[0], frames); | ||||
@@ -30,8 +30,9 @@ static NativePluginHandle bypass_instantiate(const NativeHostDescriptor* host) | |||||
(void)host; | (void)host; | ||||
} | } | ||||
// FIXME for v3.0, use const for the input buffer | |||||
static void bypass_process(NativePluginHandle handle, | static void bypass_process(NativePluginHandle handle, | ||||
const float** inBuffer, float** outBuffer, uint32_t frames, | |||||
float** inBuffer, float** outBuffer, uint32_t frames, | |||||
const NativeMidiEvent* midiEvents, uint32_t midiEventCount) | const NativeMidiEvent* midiEvents, uint32_t midiEventCount) | ||||
{ | { | ||||
if (outBuffer[0] != inBuffer[0]) | if (outBuffer[0] != inBuffer[0]) | ||||
@@ -205,8 +205,9 @@ static void lfo_set_parameter_value(NativePluginHandle handle, uint32_t index, f | |||||
} | } | ||||
} | } | ||||
// FIXME for v3.0, use const for the input buffer | |||||
static void lfo_process(NativePluginHandle handle, | static void lfo_process(NativePluginHandle handle, | ||||
const float** inBuffer, float** outBuffer, uint32_t frames, | |||||
float** inBuffer, float** outBuffer, uint32_t frames, | |||||
const NativeMidiEvent* midiEvents, uint32_t midiEventCount) | const NativeMidiEvent* midiEvents, uint32_t midiEventCount) | ||||
{ | { | ||||
const NativeHostDescriptor* const host = handlePtr->host; | const NativeHostDescriptor* const host = handlePtr->host; | ||||
@@ -106,8 +106,9 @@ static void midichanab_set_parameter_value(NativePluginHandle handle, uint32_t i | |||||
handlePtr->channels[index] = (value >= 0.5f); | handlePtr->channels[index] = (value >= 0.5f); | ||||
} | } | ||||
// FIXME for v3.0, use const for the input buffer | |||||
static void midichanab_process(NativePluginHandle handle, | static void midichanab_process(NativePluginHandle handle, | ||||
const float** inBuffer, float** outBuffer, uint32_t frames, | |||||
float** inBuffer, float** outBuffer, uint32_t frames, | |||||
const NativeMidiEvent* midiEvents, uint32_t midiEventCount) | const NativeMidiEvent* midiEvents, uint32_t midiEventCount) | ||||
{ | { | ||||
const NativeHostDescriptor* const host = handlePtr->host; | const NativeHostDescriptor* const host = handlePtr->host; | ||||
@@ -106,8 +106,9 @@ static void midichanfilter_set_parameter_value(NativePluginHandle handle, uint32 | |||||
handlePtr->channels[index] = (value >= 0.5f); | handlePtr->channels[index] = (value >= 0.5f); | ||||
} | } | ||||
// FIXME for v3.0, use const for the input buffer | |||||
static void midichanfilter_process(NativePluginHandle handle, | static void midichanfilter_process(NativePluginHandle handle, | ||||
const float** inBuffer, float** outBuffer, uint32_t frames, | |||||
float** inBuffer, float** outBuffer, uint32_t frames, | |||||
const NativeMidiEvent* midiEvents, uint32_t midiEventCount) | const NativeMidiEvent* midiEvents, uint32_t midiEventCount) | ||||
{ | { | ||||
const NativeHostDescriptor* const host = handlePtr->host; | const NativeHostDescriptor* const host = handlePtr->host; | ||||
@@ -113,8 +113,9 @@ static void midichannelize_set_parameter_value(NativePluginHandle handle, uint32 | |||||
} | } | ||||
} | } | ||||
// FIXME for v3.0, use const for the input buffer | |||||
static void midichannelize_process(NativePluginHandle handle, | static void midichannelize_process(NativePluginHandle handle, | ||||
const float** inBuffer, float** outBuffer, uint32_t frames, | |||||
float** inBuffer, float** outBuffer, uint32_t frames, | |||||
const NativeMidiEvent* midiEvents, uint32_t midiEventCount) | const NativeMidiEvent* midiEvents, uint32_t midiEventCount) | ||||
{ | { | ||||
const NativeHostDescriptor* const host = handlePtr->host; | const NativeHostDescriptor* const host = handlePtr->host; | ||||
@@ -68,7 +68,7 @@ protected: | |||||
// ------------------------------------------------------------------- | // ------------------------------------------------------------------- | ||||
// Plugin process calls | // Plugin process calls | ||||
void process2(const float**, float**, const uint32_t frames, const NativeMidiEvent* const, const uint32_t) override | |||||
void process2(const float* const*, float**, const uint32_t frames, const NativeMidiEvent* const, const uint32_t) override | |||||
{ | { | ||||
const NativeTimeInfo* const timePos(getTimeInfo()); | const NativeTimeInfo* const timePos(getTimeInfo()); | ||||
@@ -168,8 +168,9 @@ static void midigain_set_parameter_value(NativePluginHandle handle, uint32_t ind | |||||
} | } | ||||
} | } | ||||
// FIXME for v3.0, use const for the input buffer | |||||
static void midigain_process(NativePluginHandle handle, | static void midigain_process(NativePluginHandle handle, | ||||
const float** inBuffer, float** outBuffer, uint32_t frames, | |||||
float** inBuffer, float** outBuffer, uint32_t frames, | |||||
const NativeMidiEvent* midiEvents, uint32_t midiEventCount) | const NativeMidiEvent* midiEvents, uint32_t midiEventCount) | ||||
{ | { | ||||
const NativeHostDescriptor* const host = handlePtr->host; | const NativeHostDescriptor* const host = handlePtr->host; | ||||
@@ -47,8 +47,9 @@ static void midijoin_cleanup(NativePluginHandle handle) | |||||
free(handlePtr); | free(handlePtr); | ||||
} | } | ||||
// FIXME for v3.0, use const for the input buffer | |||||
static void midijoin_process(NativePluginHandle handle, | static void midijoin_process(NativePluginHandle handle, | ||||
const float** inBuffer, float** outBuffer, uint32_t frames, | |||||
float** inBuffer, float** outBuffer, uint32_t frames, | |||||
const NativeMidiEvent* midiEvents, uint32_t midiEventCount) | const NativeMidiEvent* midiEvents, uint32_t midiEventCount) | ||||
{ | { | ||||
const NativeHostDescriptor* const host = handlePtr->host; | const NativeHostDescriptor* const host = handlePtr->host; | ||||
@@ -200,7 +200,7 @@ protected: | |||||
// ------------------------------------------------------------------- | // ------------------------------------------------------------------- | ||||
// Plugin process calls | // Plugin process calls | ||||
void process(const float**, float**, const uint32_t frames, | |||||
void process(const float* const*, float**, const uint32_t frames, | |||||
const NativeMidiEvent* /*midiEvents*/, uint32_t /*midiEventCount*/) override | const NativeMidiEvent* /*midiEvents*/, uint32_t /*midiEventCount*/) override | ||||
{ | { | ||||
if (const NativeTimeInfo* const timeInfo = getTimeInfo()) | if (const NativeTimeInfo* const timeInfo = getTimeInfo()) | ||||
@@ -46,8 +46,9 @@ static void midisplit_cleanup(NativePluginHandle handle) | |||||
free(handlePtr); | free(handlePtr); | ||||
} | } | ||||
// FIXME for v3.0, use const for the input buffer | |||||
static void midisplit_process(NativePluginHandle handle, | static void midisplit_process(NativePluginHandle handle, | ||||
const float** inBuffer, float** outBuffer, uint32_t frames, | |||||
float** inBuffer, float** outBuffer, uint32_t frames, | |||||
const NativeMidiEvent* midiEvents, uint32_t midiEventCount) | const NativeMidiEvent* midiEvents, uint32_t midiEventCount) | ||||
{ | { | ||||
const NativeHostDescriptor* const host = handlePtr->host; | const NativeHostDescriptor* const host = handlePtr->host; | ||||
@@ -46,8 +46,9 @@ static void midithrough_cleanup(NativePluginHandle handle) | |||||
free(handlePtr); | free(handlePtr); | ||||
} | } | ||||
// FIXME for v3.0, use const for the input buffer | |||||
static void midithrough_process(NativePluginHandle handle, | static void midithrough_process(NativePluginHandle handle, | ||||
const float** inBuffer, float** outBuffer, uint32_t frames, | |||||
float** inBuffer, float** outBuffer, uint32_t frames, | |||||
const NativeMidiEvent* midiEvents, uint32_t midiEventCount) | const NativeMidiEvent* midiEvents, uint32_t midiEventCount) | ||||
{ | { | ||||
const NativeHostDescriptor* const host = handlePtr->host; | const NativeHostDescriptor* const host = handlePtr->host; | ||||
@@ -205,8 +205,9 @@ static void midi2cv_activate(NativePluginHandle handle) | |||||
panic(handlePtr); | panic(handlePtr); | ||||
} | } | ||||
// FIXME for v3.0, use const for the input buffer | |||||
static void midi2cv_process(NativePluginHandle handle, | static void midi2cv_process(NativePluginHandle handle, | ||||
const float** inBuffer, float** outBuffer, uint32_t frames, | |||||
float** inBuffer, float** outBuffer, uint32_t frames, | |||||
const NativeMidiEvent* midiEvents, uint32_t midiEventCount) | const NativeMidiEvent* midiEvents, uint32_t midiEventCount) | ||||
{ | { | ||||
float* const pitch = outBuffer[0]; | float* const pitch = outBuffer[0]; | ||||
@@ -130,8 +130,9 @@ static void miditranspose_set_parameter_value(NativePluginHandle handle, uint32_ | |||||
} | } | ||||
} | } | ||||
// FIXME for v3.0, use const for the input buffer | |||||
static void miditranspose_process(NativePluginHandle handle, | static void miditranspose_process(NativePluginHandle handle, | ||||
const float** inBuffer, float** outBuffer, uint32_t frames, | |||||
float** inBuffer, float** outBuffer, uint32_t frames, | |||||
const NativeMidiEvent* midiEvents, uint32_t midiEventCount) | const NativeMidiEvent* midiEvents, uint32_t midiEventCount) | ||||
{ | { | ||||
const NativeHostDescriptor* const host = handlePtr->host; | const NativeHostDescriptor* const host = handlePtr->host; | ||||
@@ -83,7 +83,7 @@ protected: | |||||
// ------------------------------------------------------------------- | // ------------------------------------------------------------------- | ||||
// Plugin process calls | // Plugin process calls | ||||
void process(const float**, float**, const uint32_t, const NativeMidiEvent* const, const uint32_t) override | |||||
void process(const float* const*, float**, const uint32_t, const NativeMidiEvent* const, const uint32_t) override | |||||
{ | { | ||||
} | } | ||||