diff --git a/source/backend/CarlaBackend.h b/source/backend/CarlaBackend.h index 97fcb9c42..a7fb155cf 100644 --- a/source/backend/CarlaBackend.h +++ b/source/backend/CarlaBackend.h @@ -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. diff --git a/source/backend/CarlaStandaloneNSM.cpp b/source/backend/CarlaStandaloneNSM.cpp index a99e5e0b6..01c22b5bf 100644 --- a/source/backend/CarlaStandaloneNSM.cpp +++ b/source/backend/CarlaStandaloneNSM.cpp @@ -502,7 +502,7 @@ protected: 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; diff --git a/source/backend/engine/CarlaEngineNative.cpp b/source/backend/engine/CarlaEngineNative.cpp index 2043ac415..9047d7633 100644 --- a/source/backend/engine/CarlaEngineNative.cpp +++ b/source/backend/engine/CarlaEngineNative.cpp @@ -1005,8 +1005,8 @@ protected: 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) diff --git a/source/backend/plugin/CarlaPlugin.cpp b/source/backend/plugin/CarlaPlugin.cpp index 736593a73..34d8d71c7 100644 --- a/source/backend/plugin/CarlaPlugin.cpp +++ b/source/backend/plugin/CarlaPlugin.cpp @@ -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'; diff --git a/source/backend/plugin/CarlaPluginBridge.cpp b/source/backend/plugin/CarlaPluginBridge.cpp index ed46ea89b..0ef3c23ab 100644 --- a/source/backend/plugin/CarlaPluginBridge.cpp +++ b/source/backend/plugin/CarlaPluginBridge.cpp @@ -1486,7 +1486,7 @@ public: 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; diff --git a/source/backend/plugin/CarlaPluginFluidSynth.cpp b/source/backend/plugin/CarlaPluginFluidSynth.cpp index 37281d823..8236a192c 100644 --- a/source/backend/plugin/CarlaPluginFluidSynth.cpp +++ b/source/backend/plugin/CarlaPluginFluidSynth.cpp @@ -767,7 +767,7 @@ public: // ---------------------- 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; @@ -780,7 +780,7 @@ public: // ---------------------- 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; @@ -793,7 +793,7 @@ public: // ---------------------- 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; @@ -806,7 +806,7 @@ public: // ---------------------- 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; @@ -820,7 +820,7 @@ public: // ---------------------- 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; @@ -941,7 +941,7 @@ public: // ---------------------- 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; @@ -1295,7 +1295,7 @@ public: 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); diff --git a/source/backend/plugin/CarlaPluginJuce.cpp b/source/backend/plugin/CarlaPluginJuce.cpp index 4d02c0d45..d5836d82a 100644 --- a/source/backend/plugin/CarlaPluginJuce.cpp +++ b/source/backend/plugin/CarlaPluginJuce.cpp @@ -670,7 +670,7 @@ public: 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; @@ -1138,7 +1138,7 @@ public: 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; diff --git a/source/backend/plugin/CarlaPluginLADSPADSSI.cpp b/source/backend/plugin/CarlaPluginLADSPADSSI.cpp index 8e46b0860..a3429809a 100644 --- a/source/backend/plugin/CarlaPluginLADSPADSSI.cpp +++ b/source/backend/plugin/CarlaPluginLADSPADSSI.cpp @@ -1138,7 +1138,7 @@ public: { 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; @@ -1172,7 +1172,7 @@ public: 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; } } @@ -1712,7 +1712,7 @@ public: 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; diff --git a/source/backend/plugin/CarlaPluginLV2.cpp b/source/backend/plugin/CarlaPluginLV2.cpp index 2add93542..9d38c3161 100644 --- a/source/backend/plugin/CarlaPluginLV2.cpp +++ b/source/backend/plugin/CarlaPluginLV2.cpp @@ -2872,7 +2872,7 @@ public: 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) && @@ -2929,7 +2929,7 @@ public: 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; } } @@ -2952,13 +2952,13 @@ public: 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; @@ -3078,7 +3078,7 @@ public: { 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; @@ -3095,7 +3095,7 @@ public: { 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; } @@ -4029,7 +4029,7 @@ public: 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; diff --git a/source/backend/plugin/CarlaPluginNative.cpp b/source/backend/plugin/CarlaPluginNative.cpp index 12eb13820..a580af754 100644 --- a/source/backend/plugin/CarlaPluginNative.cpp +++ b/source/backend/plugin/CarlaPluginNative.cpp @@ -1542,9 +1542,9 @@ public: { 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; } } @@ -2038,7 +2038,7 @@ public: 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; diff --git a/source/backend/plugin/CarlaPluginSFZero.cpp b/source/backend/plugin/CarlaPluginSFZero.cpp index 12f1fc43f..6eda39cff 100644 --- a/source/backend/plugin/CarlaPluginSFZero.cpp +++ b/source/backend/plugin/CarlaPluginSFZero.cpp @@ -277,7 +277,7 @@ public: // 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; @@ -462,7 +462,7 @@ public: 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); diff --git a/source/backend/plugin/CarlaPluginVST2.cpp b/source/backend/plugin/CarlaPluginVST2.cpp index 2eb03735f..141ff00fe 100644 --- a/source/backend/plugin/CarlaPluginVST2.cpp +++ b/source/backend/plugin/CarlaPluginVST2.cpp @@ -937,7 +937,7 @@ public: 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; @@ -1480,7 +1480,7 @@ public: 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; diff --git a/source/frontend/carla_backend.py b/source/frontend/carla_backend.py index 5f5fa975c..9a9494d24 100644 --- a/source/frontend/carla_backend.py +++ b/source/frontend/carla_backend.py @@ -300,8 +300,8 @@ PARAMETER_IS_LOGARITHMIC = 0x004 # 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. diff --git a/source/frontend/carla_widgets.py b/source/frontend/carla_widgets.py index d3551c035..9def09417 100755 --- a/source/frontend/carla_widgets.py +++ b/source/frontend/carla_widgets.py @@ -68,7 +68,7 @@ from carla_backend import ( 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, @@ -327,7 +327,7 @@ class PluginParameter(QWidget): 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) diff --git a/source/includes/CarlaNative.h b/source/includes/CarlaNative.h index 357e236e5..81840431f 100644 --- a/source/includes/CarlaNative.h +++ b/source/includes/CarlaNative.h @@ -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, diff --git a/source/includes/lv2/lv2_kxstudio_properties.h b/source/includes/lv2/lv2_kxstudio_properties.h index e8b42a6c3..f90eaca95 100644 --- a/source/includes/lv2/lv2_kxstudio_properties.h +++ b/source/includes/lv2/lv2_kxstudio_properties.h @@ -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" diff --git a/source/includes/lv2_rdf.hpp b/source/includes/lv2_rdf.hpp index 4198d3b15..4f03356f1 100644 --- a/source/includes/lv2_rdf.hpp +++ b/source/includes/lv2_rdf.hpp @@ -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) @@ -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 diff --git a/source/modules/distrho/src/DistrhoPluginCarla.cpp b/source/modules/distrho/src/DistrhoPluginCarla.cpp index 9ddb475b2..611b55bb0 100644 --- a/source/modules/distrho/src/DistrhoPluginCarla.cpp +++ b/source/modules/distrho/src/DistrhoPluginCarla.cpp @@ -236,7 +236,7 @@ protected: 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) diff --git a/source/native-plugins/audio-file.cpp b/source/native-plugins/audio-file.cpp index 4961e83ad..ae2457bd7 100644 --- a/source/native-plugins/audio-file.cpp +++ b/source/native-plugins/audio-file.cpp @@ -126,7 +126,7 @@ protected: { case kParameterLooping: param.name = "Loop Mode"; - param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMABLE| + param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMATABLE| NATIVE_PARAMETER_IS_ENABLED| NATIVE_PARAMETER_IS_BOOLEAN); param.ranges.def = 1.0f; @@ -135,7 +135,7 @@ protected: break; case kParameterHostSync: param.name = "Host Sync"; - param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMABLE| + param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMATABLE| NATIVE_PARAMETER_IS_ENABLED| NATIVE_PARAMETER_IS_BOOLEAN); #ifdef __MOD_DEVICES__ @@ -148,7 +148,7 @@ protected: break; case kParameterVolume: param.name = "Volume"; - param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMABLE| + param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMATABLE| NATIVE_PARAMETER_IS_ENABLED); param.ranges.def = 100.0f; param.ranges.min = 0.0f; @@ -159,7 +159,7 @@ protected: break; case kParameterEnabled: param.name = "Enabled"; - param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMABLE| + param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMATABLE| NATIVE_PARAMETER_IS_ENABLED| NATIVE_PARAMETER_IS_BOOLEAN| NATIVE_PARAMETER_USES_DESIGNATION); @@ -170,7 +170,7 @@ protected: break; case kParameterInfoChannels: param.name = "Num Channels"; - param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMABLE| + param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMATABLE| NATIVE_PARAMETER_IS_ENABLED| NATIVE_PARAMETER_IS_INTEGER| NATIVE_PARAMETER_IS_OUTPUT); @@ -180,7 +180,7 @@ protected: break; case kParameterInfoBitRate: param.name = "Bit Rate"; - param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMABLE| + param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMATABLE| NATIVE_PARAMETER_IS_ENABLED| NATIVE_PARAMETER_IS_INTEGER| NATIVE_PARAMETER_IS_OUTPUT); @@ -190,7 +190,7 @@ protected: break; case kParameterInfoBitDepth: param.name = "Bit Depth"; - param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMABLE| + param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMATABLE| NATIVE_PARAMETER_IS_ENABLED| NATIVE_PARAMETER_IS_INTEGER| NATIVE_PARAMETER_IS_OUTPUT); @@ -200,7 +200,7 @@ protected: break; case kParameterInfoSampleRate: param.name = "Sample Rate"; - param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMABLE| + param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMATABLE| NATIVE_PARAMETER_IS_ENABLED| NATIVE_PARAMETER_IS_INTEGER| NATIVE_PARAMETER_IS_OUTPUT); @@ -210,7 +210,7 @@ protected: break; case kParameterInfoLength: param.name = "Length"; - param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMABLE| + param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMATABLE| NATIVE_PARAMETER_IS_ENABLED| NATIVE_PARAMETER_IS_OUTPUT); param.ranges.def = 0.0f; @@ -220,7 +220,7 @@ protected: break; case kParameterInfoPosition: param.name = "Position"; - param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMABLE| + param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMATABLE| NATIVE_PARAMETER_IS_ENABLED| NATIVE_PARAMETER_IS_OUTPUT); param.ranges.def = 0.0f; @@ -230,7 +230,7 @@ protected: break; case kParameterInfoPoolFill: param.name = "Pool Fill"; - param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMABLE| + param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMATABLE| NATIVE_PARAMETER_IS_ENABLED| NATIVE_PARAMETER_IS_OUTPUT); param.ranges.def = 0.0f; diff --git a/source/native-plugins/audio-gain.c b/source/native-plugins/audio-gain.c index f0b4ced10..7a047efed 100644 --- a/source/native-plugins/audio-gain.c +++ b/source/native-plugins/audio-gain.c @@ -114,7 +114,7 @@ static const NativeParameter* audiogain_get_parameter_info(NativePluginHandle ha static NativeParameter param; - param.hints = NATIVE_PARAMETER_IS_ENABLED|NATIVE_PARAMETER_IS_AUTOMABLE; + param.hints = NATIVE_PARAMETER_IS_ENABLED|NATIVE_PARAMETER_IS_AUTOMATABLE; param.unit = NULL; param.scalePointCount = 0; param.scalePoints = NULL; diff --git a/source/native-plugins/bigmeter.cpp b/source/native-plugins/bigmeter.cpp index 4f92984c8..e8a1437c5 100644 --- a/source/native-plugins/bigmeter.cpp +++ b/source/native-plugins/bigmeter.cpp @@ -53,7 +53,7 @@ protected: static NativeParameter param; static NativeParameterScalePoint scalePoints[3]; - int hints = NATIVE_PARAMETER_IS_ENABLED|NATIVE_PARAMETER_IS_AUTOMABLE; + int hints = NATIVE_PARAMETER_IS_ENABLED|NATIVE_PARAMETER_IS_AUTOMATABLE; param.name = nullptr; param.unit = nullptr; diff --git a/source/native-plugins/cv-to-audio.c b/source/native-plugins/cv-to-audio.c index 45f370405..fda6c89ed 100644 --- a/source/native-plugins/cv-to-audio.c +++ b/source/native-plugins/cv-to-audio.c @@ -73,7 +73,7 @@ static const NativeParameter* cv2audio_get_parameter_info(NativePluginHandle han static NativeParameter param; - param.hints = NATIVE_PARAMETER_IS_ENABLED|NATIVE_PARAMETER_IS_AUTOMABLE; + param.hints = NATIVE_PARAMETER_IS_ENABLED|NATIVE_PARAMETER_IS_AUTOMATABLE; param.unit = NULL; param.scalePointCount = 0; param.scalePoints = NULL; diff --git a/source/native-plugins/lfo.c b/source/native-plugins/lfo.c index beba11f41..8cd854fa5 100644 --- a/source/native-plugins/lfo.c +++ b/source/native-plugins/lfo.c @@ -84,7 +84,7 @@ static const NativeParameter* lfo_get_parameter_info(NativePluginHandle handle, static NativeParameter param; static NativeParameterScalePoint paramModes[5]; - param.hints = NATIVE_PARAMETER_IS_ENABLED|NATIVE_PARAMETER_IS_AUTOMABLE; + param.hints = NATIVE_PARAMETER_IS_ENABLED|NATIVE_PARAMETER_IS_AUTOMATABLE; param.scalePointCount = 0; param.scalePoints = NULL; diff --git a/source/native-plugins/midi-channel-ab.c b/source/native-plugins/midi-channel-ab.c index 821e1345b..bcb5c6dcd 100644 --- a/source/native-plugins/midi-channel-ab.c +++ b/source/native-plugins/midi-channel-ab.c @@ -70,7 +70,7 @@ static const NativeParameter* midichanab_get_parameter_info(NativePluginHandle h static const NativeParameterScalePoint scalePoints[2] = { { "Output A", 0 }, { "Output B", 1 } }; static char paramName[24]; - param.hints = NATIVE_PARAMETER_IS_ENABLED|NATIVE_PARAMETER_IS_AUTOMABLE|NATIVE_PARAMETER_IS_BOOLEAN|NATIVE_PARAMETER_USES_SCALEPOINTS; + param.hints = NATIVE_PARAMETER_IS_ENABLED|NATIVE_PARAMETER_IS_AUTOMATABLE|NATIVE_PARAMETER_IS_BOOLEAN|NATIVE_PARAMETER_USES_SCALEPOINTS; param.name = paramName; param.unit = NULL; param.ranges.def = 0; diff --git a/source/native-plugins/midi-channel-filter.c b/source/native-plugins/midi-channel-filter.c index 11d1524b2..d5b9e18dd 100644 --- a/source/native-plugins/midi-channel-filter.c +++ b/source/native-plugins/midi-channel-filter.c @@ -70,7 +70,7 @@ static const NativeParameter* midichanfilter_get_parameter_info(NativePluginHand static const NativeParameterScalePoint scalePoints[2] = { { "Off", 0.0f }, { "On", 1.0f } }; static char paramName[24]; - param.hints = NATIVE_PARAMETER_IS_ENABLED|NATIVE_PARAMETER_IS_AUTOMABLE|NATIVE_PARAMETER_IS_BOOLEAN|NATIVE_PARAMETER_USES_SCALEPOINTS; + param.hints = NATIVE_PARAMETER_IS_ENABLED|NATIVE_PARAMETER_IS_AUTOMATABLE|NATIVE_PARAMETER_IS_BOOLEAN|NATIVE_PARAMETER_USES_SCALEPOINTS; param.name = paramName; param.unit = NULL; param.ranges.def = 1.0f; diff --git a/source/native-plugins/midi-channelize.c b/source/native-plugins/midi-channelize.c index 9ad42cd39..c723312b2 100644 --- a/source/native-plugins/midi-channelize.c +++ b/source/native-plugins/midi-channelize.c @@ -68,7 +68,7 @@ static const NativeParameter* midichannelize_get_parameter_info(NativePluginHand static NativeParameter param; - param.hints = NATIVE_PARAMETER_IS_ENABLED|NATIVE_PARAMETER_IS_AUTOMABLE|NATIVE_PARAMETER_IS_INTEGER; + param.hints = NATIVE_PARAMETER_IS_ENABLED|NATIVE_PARAMETER_IS_AUTOMATABLE|NATIVE_PARAMETER_IS_INTEGER; param.unit = NULL; param.scalePointCount = 0; param.scalePoints = NULL; diff --git a/source/native-plugins/midi-file.cpp b/source/native-plugins/midi-file.cpp index 2fdf28a9a..b24afa0f9 100644 --- a/source/native-plugins/midi-file.cpp +++ b/source/native-plugins/midi-file.cpp @@ -84,7 +84,7 @@ protected: { case kParameterRepeating: param.name = "Repeat Mode"; - param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMABLE| + param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMATABLE| NATIVE_PARAMETER_IS_ENABLED| NATIVE_PARAMETER_IS_BOOLEAN); param.ranges.def = 0.0f; @@ -93,7 +93,7 @@ protected: break; case kParameterHostSync: param.name = "Host Sync"; - param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMABLE| + param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMATABLE| NATIVE_PARAMETER_IS_ENABLED| NATIVE_PARAMETER_IS_BOOLEAN); #ifdef __MOD_DEVICES__ @@ -106,7 +106,7 @@ protected: break; case kParameterEnabled: param.name = "Enabled"; - param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMABLE| + param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMATABLE| NATIVE_PARAMETER_IS_ENABLED| NATIVE_PARAMETER_IS_BOOLEAN| NATIVE_PARAMETER_USES_DESIGNATION); @@ -117,7 +117,7 @@ protected: break; case kParameterInfoNumTracks: param.name = "Num Tracks"; - param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMABLE| + param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMATABLE| NATIVE_PARAMETER_IS_ENABLED| NATIVE_PARAMETER_IS_INTEGER| NATIVE_PARAMETER_IS_OUTPUT); @@ -127,7 +127,7 @@ protected: break; case kParameterInfoLength: param.name = "Length"; - param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMABLE| + param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMATABLE| NATIVE_PARAMETER_IS_ENABLED| NATIVE_PARAMETER_IS_OUTPUT); param.ranges.def = 0.0f; @@ -137,7 +137,7 @@ protected: break; case kParameterInfoPosition: param.name = "Position"; - param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMABLE| + param.hints = static_cast(NATIVE_PARAMETER_IS_AUTOMATABLE| NATIVE_PARAMETER_IS_ENABLED| NATIVE_PARAMETER_IS_OUTPUT); param.ranges.def = 0.0f; diff --git a/source/native-plugins/midi-gain.c b/source/native-plugins/midi-gain.c index 84a1351e4..fdc18de28 100644 --- a/source/native-plugins/midi-gain.c +++ b/source/native-plugins/midi-gain.c @@ -78,7 +78,7 @@ static const NativeParameter* midigain_get_parameter_info(NativePluginHandle han static NativeParameter param; - param.hints = NATIVE_PARAMETER_IS_ENABLED|NATIVE_PARAMETER_IS_AUTOMABLE; + param.hints = NATIVE_PARAMETER_IS_ENABLED|NATIVE_PARAMETER_IS_AUTOMATABLE; param.unit = NULL; param.scalePointCount = 0; param.scalePoints = NULL; diff --git a/source/native-plugins/midi-pattern.cpp b/source/native-plugins/midi-pattern.cpp index 5bf03fea9..f3626048b 100644 --- a/source/native-plugins/midi-pattern.cpp +++ b/source/native-plugins/midi-pattern.cpp @@ -79,7 +79,7 @@ protected: static NativeParameter param; static NativeParameterScalePoint scalePoints[10]; - int hints = NATIVE_PARAMETER_IS_ENABLED|NATIVE_PARAMETER_IS_AUTOMABLE|NATIVE_PARAMETER_IS_INTEGER; + int hints = NATIVE_PARAMETER_IS_ENABLED|NATIVE_PARAMETER_IS_AUTOMATABLE|NATIVE_PARAMETER_IS_INTEGER; switch (index) { diff --git a/source/native-plugins/midi-to-cv.c b/source/native-plugins/midi-to-cv.c index bc25ed4c4..a1063af05 100644 --- a/source/native-plugins/midi-to-cv.c +++ b/source/native-plugins/midi-to-cv.c @@ -114,7 +114,7 @@ static const NativeParameter* midi2cv_get_parameter_info(NativePluginHandle hand static NativeParameter param; - param.hints = NATIVE_PARAMETER_IS_ENABLED|NATIVE_PARAMETER_IS_AUTOMABLE; + param.hints = NATIVE_PARAMETER_IS_ENABLED|NATIVE_PARAMETER_IS_AUTOMATABLE; param.unit = NULL; param.scalePointCount = 0; param.scalePoints = NULL; diff --git a/source/native-plugins/midi-transpose.c b/source/native-plugins/midi-transpose.c index 3ff57abda..2e1d3a4bf 100644 --- a/source/native-plugins/midi-transpose.c +++ b/source/native-plugins/midi-transpose.c @@ -71,7 +71,7 @@ static const NativeParameter* miditranspose_get_parameter_info(NativePluginHandl static NativeParameter param; - param.hints = NATIVE_PARAMETER_IS_ENABLED|NATIVE_PARAMETER_IS_AUTOMABLE|NATIVE_PARAMETER_IS_INTEGER; + param.hints = NATIVE_PARAMETER_IS_ENABLED|NATIVE_PARAMETER_IS_AUTOMATABLE|NATIVE_PARAMETER_IS_INTEGER; param.unit = NULL; param.scalePointCount = 0; param.scalePoints = NULL; diff --git a/source/native-plugins/notes.cpp b/source/native-plugins/notes.cpp index b75404900..8b73f7160 100644 --- a/source/native-plugins/notes.cpp +++ b/source/native-plugins/notes.cpp @@ -45,7 +45,7 @@ protected: static NativeParameter param; param.hints = static_cast(NATIVE_PARAMETER_IS_ENABLED - |NATIVE_PARAMETER_IS_AUTOMABLE + |NATIVE_PARAMETER_IS_AUTOMATABLE |NATIVE_PARAMETER_IS_INTEGER); param.name = "Page"; param.unit = nullptr; diff --git a/source/native-plugins/xycontroller.cpp b/source/native-plugins/xycontroller.cpp index 3c1cfcde6..ba22157d2 100644 --- a/source/native-plugins/xycontroller.cpp +++ b/source/native-plugins/xycontroller.cpp @@ -63,7 +63,7 @@ protected: static NativeParameter param; - int hints = NATIVE_PARAMETER_IS_ENABLED|NATIVE_PARAMETER_IS_AUTOMABLE; + int hints = NATIVE_PARAMETER_IS_ENABLED|NATIVE_PARAMETER_IS_AUTOMATABLE; param.name = nullptr; param.unit = "%"; diff --git a/source/plugin/carla-lv2-export.cpp b/source/plugin/carla-lv2-export.cpp index 1bc31acee..b64df5482 100644 --- a/source/plugin/carla-lv2-export.cpp +++ b/source/plugin/carla-lv2-export.cpp @@ -685,7 +685,7 @@ static void writePluginFile(const NativePluginDescriptor* const pluginDesc, text += " lv2:minimum " + String::formatted("%f", static_cast(paramInfo->ranges.min)) + " ;\n"; text += " lv2:maximum " + String::formatted("%f", static_cast(paramInfo->ranges.max)) + " ;\n"; - if ((paramInfo->hints & NATIVE_PARAMETER_IS_AUTOMABLE) == 0) + if ((paramInfo->hints & NATIVE_PARAMETER_IS_AUTOMATABLE) == 0) text += " lv2:portProperty <" LV2_PORT_PROPS__expensive "> ;\n"; if (paramInfo->hints & NATIVE_PARAMETER_IS_BOOLEAN) text += " lv2:portProperty lv2:toggled ;\n"; diff --git a/source/utils/CarlaLv2Utils.hpp b/source/utils/CarlaLv2Utils.hpp index 225b70739..5178b3f9e 100644 --- a/source/utils/CarlaLv2Utils.hpp +++ b/source/utils/CarlaLv2Utils.hpp @@ -224,7 +224,7 @@ public: Lilv::Node pprop_notAutomatic; Lilv::Node pprop_notOnGUI; Lilv::Node pprop_trigger; - Lilv::Node pprop_nonAutomable; + Lilv::Node pprop_nonAutomatable; // Unit Hints Lilv::Node unit_name; @@ -364,7 +364,7 @@ public: pprop_notAutomatic (new_uri(LV2_PORT_PROPS__notAutomatic)), pprop_notOnGUI (new_uri(LV2_PORT_PROPS__notOnGUI)), pprop_trigger (new_uri(LV2_PORT_PROPS__trigger)), - pprop_nonAutomable (new_uri(LV2_KXSTUDIO_PROPERTIES__NonAutomable)), + pprop_nonAutomatable (new_uri(LV2_KXSTUDIO_PROPERTIES__NonAutomatable)), unit_name (new_uri(LV2_UNITS__name)), unit_render (new_uri(LV2_UNITS__render)), @@ -2020,8 +2020,8 @@ const LV2_RDF_Descriptor* lv2_rdf_new(const LV2_URI uri, const bool loadPresets) rdfPort->Properties |= LV2_PORT_NOT_ON_GUI; if (lilvPort.has_property(lv2World.pprop_trigger)) rdfPort->Properties |= LV2_PORT_TRIGGER; - if (lilvPort.has_property(lv2World.pprop_nonAutomable)) - rdfPort->Properties |= LV2_PORT_NON_AUTOMABLE; + if (lilvPort.has_property(lv2World.pprop_nonAutomatable)) + rdfPort->Properties |= LV2_PORT_NON_AUTOMATABLE; if (lilvPort.has_property(lv2World.reportsLatency)) rdfPort->Designation = LV2_PORT_DESIGNATION_LATENCY;