Skip to content

Commit

Permalink
Automable is not a word, sorry!
Browse files Browse the repository at this point in the history 
Signed-off-by: falkTX <falktx@falktx.com>
  • Loading branch information
@falkTX
falkTX committed Nov 24, 2021
1 parent 095c25d commit ea7ed82
Show file tree
Hide file tree
Showing 35 changed files with 84 additions and 80 deletions.
7 changes: 5 additions & 2 deletions source/backend/CarlaBackend.h
View file
Expand Up @@ -309,9 +309,12 @@ static const uint PARAMETER_IS_LOGARITHMIC = 0x004;
static const uint PARAMETER_IS_ENABLED = 0x010;

/*!
* Parameter is automable (real-time safe).
* Parameter is automatable (real-time safe).
*/
static const uint PARAMETER_IS_AUTOMABLE = 0x020;
static const uint PARAMETER_IS_AUTOMATABLE = 0x020;

// for backwards compatibility
static const uint PARAMETER_IS_AUTOMABLE = PARAMETER_IS_AUTOMATABLE;

/*!
* Parameter is read-only.
Expand Down
2 changes: 1 addition & 1 deletion source/backend/CarlaStandaloneNSM.cpp
View file
Expand Up @@ -502,7 +502,7 @@ class CarlaNSM
continue;
if ((paramData->hints & CB::PARAMETER_IS_ENABLED) == 0)
continue;
if ((paramData->hints & CB::PARAMETER_IS_AUTOMABLE) == 0)
if ((paramData->hints & CB::PARAMETER_IS_AUTOMATABLE) == 0)
continue;
if (paramData->hints & CB::PARAMETER_IS_READ_ONLY)
continue;
Expand Down
4 changes: 2 additions & 2 deletions source/backend/engine/CarlaEngineNative.cpp
View file
Expand Up @@ -1005,8 +1005,8 @@ class CarlaEngineNative : public CarlaEngine
hints |= NATIVE_PARAMETER_IS_INTEGER;
if (paramData.hints & PARAMETER_IS_LOGARITHMIC)
hints |= NATIVE_PARAMETER_IS_LOGARITHMIC;
if (paramData.hints & PARAMETER_IS_AUTOMABLE)
hints |= NATIVE_PARAMETER_IS_AUTOMABLE;
if (paramData.hints & PARAMETER_IS_AUTOMATABLE)
hints |= NATIVE_PARAMETER_IS_AUTOMATABLE;
if (paramData.hints & PARAMETER_USES_SAMPLERATE)
hints |= NATIVE_PARAMETER_USES_SAMPLE_RATE;
if (paramData.hints & PARAMETER_USES_SCALEPOINTS)
Expand Down
2 changes: 1 addition & 1 deletion source/backend/plugin/CarlaPlugin.cpp
View file
Expand Up @@ -1230,7 +1230,7 @@ bool CarlaPlugin::exportAsLV2(const char* const lv2path)
if (paramData.hints & PARAMETER_IS_INTEGER)
mainStream << " lv2:portProperty lv2:integer ;\n";

// TODO logarithmic, enabled (not on gui), automable, samplerate, scalepoints
// TODO logarithmic, enabled (not on gui), automatable, samplerate, scalepoints

if (! getParameterName(i, strBufName))
strBufName[0] = '\0';
Expand Down
2 changes: 1 addition & 1 deletion source/backend/plugin/CarlaPluginBridge.cpp
View file
Expand Up @@ -1486,7 +1486,7 @@ class CarlaPluginBridge : public CarlaPlugin
continue;
if (pData->param.data[k].type != PARAMETER_INPUT)
continue;
if ((pData->param.data[k].hints & PARAMETER_IS_AUTOMABLE) == 0)
if ((pData->param.data[k].hints & PARAMETER_IS_AUTOMATABLE) == 0)
continue;

ctrlEvent.handled = true;
Expand Down
14 changes: 7 additions & 7 deletions source/backend/plugin/CarlaPluginFluidSynth.cpp
View file
Expand Up @@ -767,7 +767,7 @@ class CarlaPluginFluidSynth : public CarlaPlugin
// ----------------------
j = FluidSynthReverbOnOff;
pData->param.data[j].type = PARAMETER_INPUT;
pData->param.data[j].hints = PARAMETER_IS_ENABLED /*| PARAMETER_IS_AUTOMABLE*/ | PARAMETER_IS_BOOLEAN;
pData->param.data[j].hints = PARAMETER_IS_ENABLED /*| PARAMETER_IS_AUTOMATABLE*/ | PARAMETER_IS_BOOLEAN;
pData->param.data[j].index = j;
pData->param.data[j].rindex = j;
pData->param.ranges[j].min = 0.0f;
Expand All @@ -780,7 +780,7 @@ class CarlaPluginFluidSynth : public CarlaPlugin
// ----------------------
j = FluidSynthReverbRoomSize;
pData->param.data[j].type = PARAMETER_INPUT;
pData->param.data[j].hints = PARAMETER_IS_ENABLED /*| PARAMETER_IS_AUTOMABLE*/;
pData->param.data[j].hints = PARAMETER_IS_ENABLED /*| PARAMETER_IS_AUTOMATABLE*/;
pData->param.data[j].index = j;
pData->param.data[j].rindex = j;
pData->param.ranges[j].min = 0.0f;
Expand All @@ -793,7 +793,7 @@ class CarlaPluginFluidSynth : public CarlaPlugin
// ----------------------
j = FluidSynthReverbDamp;
pData->param.data[j].type = PARAMETER_INPUT;
pData->param.data[j].hints = PARAMETER_IS_ENABLED /*| PARAMETER_IS_AUTOMABLE*/;
pData->param.data[j].hints = PARAMETER_IS_ENABLED /*| PARAMETER_IS_AUTOMATABLE*/;
pData->param.data[j].index = j;
pData->param.data[j].rindex = j;
pData->param.ranges[j].min = 0.0f;
Expand All @@ -806,7 +806,7 @@ class CarlaPluginFluidSynth : public CarlaPlugin
// ----------------------
j = FluidSynthReverbLevel;
pData->param.data[j].type = PARAMETER_INPUT;
pData->param.data[j].hints = PARAMETER_IS_ENABLED /*| PARAMETER_IS_AUTOMABLE*/;
pData->param.data[j].hints = PARAMETER_IS_ENABLED /*| PARAMETER_IS_AUTOMATABLE*/;
pData->param.data[j].index = j;
pData->param.data[j].rindex = j;
pData->param.data[j].mappedControlIndex = MIDI_CONTROL_REVERB_SEND_LEVEL;
Expand All @@ -820,7 +820,7 @@ class CarlaPluginFluidSynth : public CarlaPlugin
// ----------------------
j = FluidSynthReverbWidth;
pData->param.data[j].type = PARAMETER_INPUT;
pData->param.data[j].hints = PARAMETER_IS_ENABLED /*| PARAMETER_IS_AUTOMABLE*/;
pData->param.data[j].hints = PARAMETER_IS_ENABLED /*| PARAMETER_IS_AUTOMATABLE*/;
pData->param.data[j].index = j;
pData->param.data[j].rindex = j;
pData->param.ranges[j].min = 0.0f;
Expand Down Expand Up @@ -941,7 +941,7 @@ class CarlaPluginFluidSynth : public CarlaPlugin
// ----------------------
j = FluidSynthVoiceCount;
pData->param.data[j].type = PARAMETER_OUTPUT;
pData->param.data[j].hints = PARAMETER_IS_ENABLED | PARAMETER_IS_AUTOMABLE | PARAMETER_IS_INTEGER;
pData->param.data[j].hints = PARAMETER_IS_ENABLED | PARAMETER_IS_AUTOMATABLE | PARAMETER_IS_INTEGER;
pData->param.data[j].index = j;
pData->param.data[j].rindex = j;
pData->param.ranges[j].min = 0.0f;
Expand Down Expand Up @@ -1295,7 +1295,7 @@ class CarlaPluginFluidSynth : public CarlaPlugin
continue;
if (pData->param.data[k].hints != PARAMETER_INPUT)
continue;
if ((pData->param.data[k].hints & PARAMETER_IS_AUTOMABLE) == 0)
if ((pData->param.data[k].hints & PARAMETER_IS_AUTOMATABLE) == 0)
continue;

value = pData->param.getFinalUnnormalizedValue(k, ctrlEvent.normalizedValue);
Expand Down
4 changes: 2 additions & 2 deletions source/backend/plugin/CarlaPluginJuce.cpp
View file
Expand Up @@ -670,7 +670,7 @@ class CarlaPluginJuce : public CarlaPlugin,
pData->param.data[j].hints |= PARAMETER_USES_CUSTOM_TEXT;

if (parameter->isAutomatable())
pData->param.data[j].hints |= PARAMETER_IS_AUTOMABLE;
pData->param.data[j].hints |= PARAMETER_IS_AUTOMATABLE;

const float min = 0.0f;
const float max = 1.0f;
Expand Down Expand Up @@ -1138,7 +1138,7 @@ class CarlaPluginJuce : public CarlaPlugin,
continue;
if (pData->param.data[k].type != PARAMETER_INPUT)
continue;
if ((pData->param.data[k].hints & PARAMETER_IS_AUTOMABLE) == 0)
if ((pData->param.data[k].hints & PARAMETER_IS_AUTOMATABLE) == 0)
continue;

ctrlEvent.handled = true;
Expand Down
6 changes: 3 additions & 3 deletions source/backend/plugin/CarlaPluginLADSPADSSI.cpp
View file
Expand Up @@ -1138,7 +1138,7 @@ class CarlaPluginLADSPADSSI : public CarlaPlugin
{
pData->param.data[j].type = PARAMETER_INPUT;
pData->param.data[j].hints |= PARAMETER_IS_ENABLED;
pData->param.data[j].hints |= PARAMETER_IS_AUTOMABLE;
pData->param.data[j].hints |= PARAMETER_IS_AUTOMATABLE;
pData->param.data[j].hints |= PARAMETER_CAN_BE_CV_CONTROLLED;
needsCtrlIn = true;

Expand Down Expand Up @@ -1172,7 +1172,7 @@ class CarlaPluginLADSPADSSI : public CarlaPlugin
else
{
pData->param.data[j].hints |= PARAMETER_IS_ENABLED;
pData->param.data[j].hints |= PARAMETER_IS_AUTOMABLE;
pData->param.data[j].hints |= PARAMETER_IS_AUTOMATABLE;
needsCtrlOut = true;
}
}
Expand Down Expand Up @@ -1712,7 +1712,7 @@ class CarlaPluginLADSPADSSI : public CarlaPlugin
continue;
if (pData->param.data[k].type != PARAMETER_INPUT)
continue;
if ((pData->param.data[k].hints & PARAMETER_IS_AUTOMABLE) == 0)
if ((pData->param.data[k].hints & PARAMETER_IS_AUTOMATABLE) == 0)
continue;

ctrlEvent.handled = true;
Expand Down
20 changes: 10 additions & 10 deletions source/backend/plugin/CarlaPluginLV2.cpp
View file
Expand Up @@ -2872,7 +2872,7 @@ class CarlaPluginLV2 : public CarlaPlugin,
else
{
pData->param.data[j].hints |= PARAMETER_IS_ENABLED;
pData->param.data[j].hints |= PARAMETER_IS_AUTOMABLE;
pData->param.data[j].hints |= PARAMETER_IS_AUTOMATABLE;
needsCtrlIn = true;

if (! LV2_IS_PORT_CAUSES_ARTIFACTS(portProps) &&
Expand Down Expand Up @@ -2929,7 +2929,7 @@ class CarlaPluginLV2 : public CarlaPlugin,
else
{
pData->param.data[j].hints |= PARAMETER_IS_ENABLED;
pData->param.data[j].hints |= PARAMETER_IS_AUTOMABLE;
pData->param.data[j].hints |= PARAMETER_IS_AUTOMATABLE;
needsCtrlOut = true;
}
}
Expand All @@ -2952,13 +2952,13 @@ class CarlaPluginLV2 : public CarlaPlugin,
if (LV2_IS_PORT_ENUMERATION(portProps))
pData->param.data[j].hints |= PARAMETER_USES_SCALEPOINTS;

// check if parameter is not enabled or automable
// check if parameter is not enabled or automatable
if (LV2_IS_PORT_NOT_ON_GUI(portProps))
pData->param.data[j].hints &= ~(PARAMETER_IS_ENABLED|PARAMETER_IS_AUTOMABLE);
pData->param.data[j].hints &= ~(PARAMETER_IS_ENABLED|PARAMETER_IS_AUTOMATABLE);
else if (LV2_IS_PORT_CAUSES_ARTIFACTS(portProps) || LV2_IS_PORT_EXPENSIVE(portProps))
pData->param.data[j].hints &= ~PARAMETER_IS_AUTOMABLE;
else if (LV2_IS_PORT_NOT_AUTOMATIC(portProps) || LV2_IS_PORT_NON_AUTOMABLE(portProps))
pData->param.data[j].hints &= ~PARAMETER_IS_AUTOMABLE;
pData->param.data[j].hints &= ~PARAMETER_IS_AUTOMATABLE;
else if (LV2_IS_PORT_NOT_AUTOMATIC(portProps) || LV2_IS_PORT_NON_AUTOMATABLE(portProps))
pData->param.data[j].hints &= ~PARAMETER_IS_AUTOMATABLE;

pData->param.ranges[j].min = min;
pData->param.ranges[j].max = max;
Expand Down Expand Up @@ -3078,7 +3078,7 @@ class CarlaPluginLV2 : public CarlaPlugin,
{
pData->param.data[j].type = PARAMETER_INPUT;
pData->param.data[j].hints |= PARAMETER_IS_ENABLED;
pData->param.data[j].hints |= PARAMETER_IS_AUTOMABLE;
pData->param.data[j].hints |= PARAMETER_IS_AUTOMATABLE;
pData->param.data[j].hints |= PARAMETER_IS_NOT_SAVED;
needsCtrlIn = true;

Expand All @@ -3095,7 +3095,7 @@ class CarlaPluginLV2 : public CarlaPlugin,
{
pData->param.data[j].type = PARAMETER_OUTPUT;
pData->param.data[j].hints |= PARAMETER_IS_ENABLED;
pData->param.data[j].hints |= PARAMETER_IS_AUTOMABLE;
pData->param.data[j].hints |= PARAMETER_IS_AUTOMATABLE;
needsCtrlOut = true;
hasPatchParameterOutputs = true;
}
Expand Down Expand Up @@ -4029,7 +4029,7 @@ class CarlaPluginLV2 : public CarlaPlugin,
continue;
if (pData->param.data[k].type != PARAMETER_INPUT)
continue;
if ((pData->param.data[k].hints & PARAMETER_IS_AUTOMABLE) == 0)
if ((pData->param.data[k].hints & PARAMETER_IS_AUTOMATABLE) == 0)
continue;

ctrlEvent.handled = true;
Expand Down
6 changes: 3 additions & 3 deletions source/backend/plugin/CarlaPluginNative.cpp
View file
Expand Up @@ -1542,9 +1542,9 @@ class CarlaPluginNative : public CarlaPlugin
{
pData->param.data[j].hints |= PARAMETER_IS_ENABLED;

if (paramInfo->hints & NATIVE_PARAMETER_IS_AUTOMABLE)
if (paramInfo->hints & NATIVE_PARAMETER_IS_AUTOMATABLE)
{
pData->param.data[j].hints |= PARAMETER_IS_AUTOMABLE;
pData->param.data[j].hints |= PARAMETER_IS_AUTOMATABLE;
pData->param.data[j].hints |= PARAMETER_CAN_BE_CV_CONTROLLED;
}
}
Expand Down Expand Up @@ -2038,7 +2038,7 @@ class CarlaPluginNative : public CarlaPlugin
continue;
if (pData->param.data[k].type != PARAMETER_INPUT)
continue;
if ((pData->param.data[k].hints & PARAMETER_IS_AUTOMABLE) == 0)
if ((pData->param.data[k].hints & PARAMETER_IS_AUTOMATABLE) == 0)
continue;

ctrlEvent.handled = true;
Expand Down
4 changes: 2 additions & 2 deletions source/backend/plugin/CarlaPluginSFZero.cpp
View file
Expand Up @@ -277,7 +277,7 @@ class CarlaPluginSFZero : public CarlaPlugin
// Parameters

pData->param.data[0].type = PARAMETER_OUTPUT;
pData->param.data[0].hints = PARAMETER_IS_ENABLED | PARAMETER_IS_AUTOMABLE | PARAMETER_IS_INTEGER;
pData->param.data[0].hints = PARAMETER_IS_ENABLED | PARAMETER_IS_AUTOMATABLE | PARAMETER_IS_INTEGER;
pData->param.data[0].index = 0;
pData->param.data[0].rindex = 0;
pData->param.ranges[0].min = 0.0f;
Expand Down Expand Up @@ -462,7 +462,7 @@ class CarlaPluginSFZero : public CarlaPlugin
continue;
if (pData->param.data[k].hints != PARAMETER_INPUT)
continue;
if ((pData->param.data[k].hints & PARAMETER_IS_AUTOMABLE) == 0)
if ((pData->param.data[k].hints & PARAMETER_IS_AUTOMATABLE) == 0)
continue;

value = pData->param.getFinalUnnormalizedValue(k, ctrlEvent.normalizedValue);
Expand Down
4 changes: 2 additions & 2 deletions source/backend/plugin/CarlaPluginVST2.cpp
View file
Expand Up @@ -937,7 +937,7 @@ class CarlaPluginVST2 : public CarlaPlugin,

if ((pData->hints & PLUGIN_USES_OLD_VSTSDK) != 0 || dispatcher(effCanBeAutomated, ij) == 1)
{
pData->param.data[j].hints |= PARAMETER_IS_AUTOMABLE;
pData->param.data[j].hints |= PARAMETER_IS_AUTOMATABLE;

if ((prop.flags & (kVstParameterIsSwitch|kVstParameterUsesIntStep)) == 0x0)
pData->param.data[j].hints |= PARAMETER_CAN_BE_CV_CONTROLLED;
Expand Down Expand Up @@ -1480,7 +1480,7 @@ class CarlaPluginVST2 : public CarlaPlugin,
continue;
if (pData->param.data[k].type != PARAMETER_INPUT)
continue;
if ((pData->param.data[k].hints & PARAMETER_IS_AUTOMABLE) == 0)
if ((pData->param.data[k].hints & PARAMETER_IS_AUTOMATABLE) == 0)
continue;

ctrlEvent.handled = true;
Expand Down
4 changes: 2 additions & 2 deletions source/frontend/carla_backend.py
View file
Expand Up @@ -300,8 +300,8 @@ def structToDict(struct):
# It can be viewed, changed and stored.
PARAMETER_IS_ENABLED = 0x010

# Parameter is automable (real-time safe).
PARAMETER_IS_AUTOMABLE = 0x020
# Parameter is automatable (real-time safe).
PARAMETER_IS_AUTOMATABLE = 0x020

# Parameter is read-only.
# It cannot be changed.
Expand Down
4 changes: 2 additions & 2 deletions source/frontend/carla_widgets.py
View file
Expand Up @@ -68,7 +68,7 @@
PARAMETER_PANNING,
PARAMETER_CTRL_CHANNEL,
PARAMETER_IS_ENABLED,
PARAMETER_IS_AUTOMABLE,
PARAMETER_IS_AUTOMATABLE,
PARAMETER_IS_READ_ONLY,
PARAMETER_USES_SCALEPOINTS,
PARAMETER_USES_CUSTOM_TEXT,
Expand Down Expand Up @@ -327,7 +327,7 @@ def __init__(self, parent, host, pInfo, pluginId, tabIndex):
self.ui.widget.setReadOnly(True)
self.ui.tb_options.setEnabled(False)

elif not pHints & PARAMETER_IS_AUTOMABLE:
elif not pHints & PARAMETER_IS_AUTOMATABLE:
self.ui.l_status.setEnabled(False)
self.ui.tb_options.setEnabled(False)

Expand Down
3 changes: 2 additions & 1 deletion source/includes/CarlaNative.h
View file
Expand Up @@ -89,7 +89,8 @@ typedef enum {
typedef enum {
NATIVE_PARAMETER_IS_OUTPUT = 1 << 0,
NATIVE_PARAMETER_IS_ENABLED = 1 << 1,
NATIVE_PARAMETER_IS_AUTOMABLE = 1 << 2,
NATIVE_PARAMETER_IS_AUTOMATABLE = 1 << 2,
NATIVE_PARAMETER_IS_AUTOMABLE = NATIVE_PARAMETER_IS_AUTOMATABLE, // there was a typo..
NATIVE_PARAMETER_IS_BOOLEAN = 1 << 3,
NATIVE_PARAMETER_IS_INTEGER = 1 << 4,
NATIVE_PARAMETER_IS_LOGARITHMIC = 1 << 5,
Expand Down
2 changes: 1 addition & 1 deletion source/includes/lv2/lv2_kxstudio_properties.h
View file
Expand Up @@ -26,7 +26,7 @@
#define LV2_KXSTUDIO_PROPERTIES_URI "http://kxstudio.sf.net/ns/lv2ext/props"
#define LV2_KXSTUDIO_PROPERTIES_PREFIX LV2_KXSTUDIO_PROPERTIES_URI "#"

#define LV2_KXSTUDIO_PROPERTIES__NonAutomable LV2_KXSTUDIO_PROPERTIES_PREFIX "NonAutomable"
#define LV2_KXSTUDIO_PROPERTIES__NonAutomatable LV2_KXSTUDIO_PROPERTIES_PREFIX "NonAutomatable"
#define LV2_KXSTUDIO_PROPERTIES__TimePositionTicksPerBeat LV2_KXSTUDIO_PROPERTIES_PREFIX "TimePositionTicksPerBeat"
#define LV2_KXSTUDIO_PROPERTIES__TransientWindowId LV2_KXSTUDIO_PROPERTIES_PREFIX "TransientWindowId"

Expand Down
4 changes: 2 additions & 2 deletions source/includes/lv2_rdf.hpp
View file
Expand Up @@ -168,7 +168,7 @@ typedef uint32_t LV2_Property;
#define LV2_PORT_NOT_AUTOMATIC 0x0800
#define LV2_PORT_NOT_ON_GUI 0x1000
#define LV2_PORT_TRIGGER 0x2000
#define LV2_PORT_NON_AUTOMABLE 0x4000
#define LV2_PORT_NON_AUTOMATABLE 0x4000

#define LV2_IS_PORT_OPTIONAL(x) ((x) & LV2_PORT_OPTIONAL)
#define LV2_IS_PORT_ENUMERATION(x) ((x) & LV2_PORT_ENUMERATION)
Expand All @@ -184,7 +184,7 @@ typedef uint32_t LV2_Property;
#define LV2_IS_PORT_NOT_AUTOMATIC(x) ((x) & LV2_PORT_NOT_AUTOMATIC)
#define LV2_IS_PORT_NOT_ON_GUI(x) ((x) & LV2_PORT_NOT_ON_GUI)
#define LV2_IS_PORT_TRIGGER(x) ((x) & LV2_PORT_TRIGGER)
#define LV2_IS_PORT_NON_AUTOMABLE(x) ((x) & LV2_PORT_NON_AUTOMABLE)
#define LV2_IS_PORT_NON_AUTOMATABLE(x) ((x) & LV2_PORT_NON_AUTOMATABLE)

// Port Designation
#define LV2_PORT_DESIGNATION_CONTROL 1
Expand Down
2 changes: 1 addition & 1 deletion source/modules/distrho/src/DistrhoPluginCarla.cpp
View file
Expand Up @@ -236,7 +236,7 @@ class PluginCarla : public NativePluginClass
const uint32_t paramHints = fPlugin.getParameterHints(index);

if (paramHints & kParameterIsAutomable)
nativeParamHints |= ::NATIVE_PARAMETER_IS_AUTOMABLE;
nativeParamHints |= ::NATIVE_PARAMETER_IS_AUTOMATABLE;
if (paramHints & kParameterIsBoolean)
nativeParamHints |= ::NATIVE_PARAMETER_IS_BOOLEAN;
if (paramHints & kParameterIsInteger)
Expand Down

0 comments on commit ea7ed82

Please sign in to comment.