diff options
| author | falkTX <falktx@gmail.com> | 2015-06-13 17:43:08 +0200 |
|---|---|---|
| committer | falkTX <falktx@gmail.com> | 2015-06-13 17:43:08 +0200 |
| commit | 12bb7420f9e2145e7dc16fd5e212cb5c274a5f79 (patch) | |
| tree | 8c7e2c5f68f3c83b2d5b3cfd02d1c816c1435388 | |
| parent | 7a3210e063620e54ca6f2dbef6c49188a6fd0a88 (diff) | |
Update all other plugins to new DPF
61 files changed, 920 insertions, 946 deletions
diff --git a/plugins/Makefile.mk b/plugins/Makefile.mk index c2c2ff8..dcfe8ec 100644 --- a/plugins/Makefile.mk +++ b/plugins/Makefile.mk @@ -14,7 +14,7 @@ include ../../Makefile.mk TARGET_DIR = ../../bin BUILD_C_FLAGS += -I. -BUILD_CXX_FLAGS += -I. -I../../dpf/distrho -I../../dpf/dgl +BUILD_CXX_FLAGS += -I. -I.. -I../../dpf/distrho -I../../dpf/dgl ifeq ($(HAVE_DGL),true) BASE_FLAGS += -DHAVE_DGL diff --git a/plugins/ZaMultiComp/ZaMultiCompPlugin.cpp b/plugins/ZaMultiComp/ZaMultiCompPlugin.cpp index 79e0fa2..75b02ac 100644 --- a/plugins/ZaMultiComp/ZaMultiCompPlugin.cpp +++ b/plugins/ZaMultiComp/ZaMultiCompPlugin.cpp @@ -25,13 +25,13 @@ ZaMultiCompPlugin::ZaMultiCompPlugin() : Plugin(paramCount, 1, 0) // 1 program, 0 states { // set default values - d_setProgram(0); + loadProgram(0); } // ----------------------------------------------------------------------- // Init -void ZaMultiCompPlugin::d_initParameter(uint32_t index, Parameter& parameter) +void ZaMultiCompPlugin::initParameter(uint32_t index, Parameter& parameter) { switch (index) { @@ -227,7 +227,7 @@ void ZaMultiCompPlugin::d_initParameter(uint32_t index, Parameter& parameter) } } -void ZaMultiCompPlugin::d_initProgramName(uint32_t index, d_string& programName) +void ZaMultiCompPlugin::initProgramName(uint32_t index, String& programName) { if (index != 0) return; @@ -238,7 +238,7 @@ void ZaMultiCompPlugin::d_initProgramName(uint32_t index, d_string& programName) // ----------------------------------------------------------------------- // Internal data -float ZaMultiCompPlugin::d_getParameterValue(uint32_t index) const +float ZaMultiCompPlugin::getParameterValue(uint32_t index) const { switch (index) { @@ -310,7 +310,7 @@ float ZaMultiCompPlugin::d_getParameterValue(uint32_t index) const } } -void ZaMultiCompPlugin::d_setParameterValue(uint32_t index, float value) +void ZaMultiCompPlugin::setParameterValue(uint32_t index, float value) { switch (index) { @@ -392,7 +392,7 @@ void ZaMultiCompPlugin::d_setParameterValue(uint32_t index, float value) } } -void ZaMultiCompPlugin::d_setProgram(uint32_t index) +void ZaMultiCompPlugin::loadProgram(uint32_t index) { if (index != 0) return; @@ -423,13 +423,13 @@ void ZaMultiCompPlugin::d_setProgram(uint32_t index) /* Default variable values */ /* reset filter values */ - d_activate(); + activate(); } // ----------------------------------------------------------------------- // Process -void ZaMultiCompPlugin::d_activate() +void ZaMultiCompPlugin::activate() { int i; for (i = 0; i < MAX_COMP; i++) { @@ -493,7 +493,7 @@ void ZaMultiCompPlugin::set_hp_coeffs(float fc, float q, float sr, int i, float float ZaMultiCompPlugin::run_comp(int k, float in) { - float srate = d_getSampleRate(); + float srate = getSampleRate(); float width=(knee-0.99f)*6.f; float release_coeff = exp(-1000.f/(release * srate)); float attack_coeff; @@ -548,9 +548,9 @@ float ZaMultiCompPlugin::run_comp(int k, float in) return sanitize_denormal(out); } -void ZaMultiCompPlugin::d_run(const float** inputs, float** outputs, uint32_t frames) +void ZaMultiCompPlugin::run(const float** inputs, float** outputs, uint32_t frames) { - float srate = d_getSampleRate(); + float srate = getSampleRate(); float max = 0.f; int tog1 = (toggle[0] > 0.5f) ? 1 : 0; diff --git a/plugins/ZaMultiComp/ZaMultiCompPlugin.hpp b/plugins/ZaMultiComp/ZaMultiCompPlugin.hpp index fde8c4f..2cc963e 100644 --- a/plugins/ZaMultiComp/ZaMultiCompPlugin.hpp +++ b/plugins/ZaMultiComp/ZaMultiCompPlugin.hpp @@ -71,27 +71,27 @@ protected: // ------------------------------------------------------------------- // Information - const char* d_getLabel() const noexcept override + const char* getLabel() const noexcept override { return "ZaMultiComp"; } - const char* d_getMaker() const noexcept override + const char* getMaker() const noexcept override { return "Damien Zammit"; } - const char* d_getLicense() const noexcept override + const char* getLicense() const noexcept override { return "GPL v2+"; } - uint32_t d_getVersion() const noexcept override + uint32_t getVersion() const noexcept override { return 0x1000; } - int64_t d_getUniqueId() const noexcept override + int64_t getUniqueId() const noexcept override { return d_cconst('Z', 'M', 'C', 'P'); } @@ -99,15 +99,15 @@ protected: // ------------------------------------------------------------------- // Init - void d_initParameter(uint32_t index, Parameter& parameter) override; - void d_initProgramName(uint32_t index, d_string& programName) override; + void initParameter(uint32_t index, Parameter& parameter) override; + void initProgramName(uint32_t index, String& programName) override; // ------------------------------------------------------------------- // Internal data - float d_getParameterValue(uint32_t index) const override; - void d_setParameterValue(uint32_t index, float value) override; - void d_setProgram(uint32_t index) override; + float getParameterValue(uint32_t index) const override; + void setParameterValue(uint32_t index, float value) override; + void loadProgram(uint32_t index) override; // ------------------------------------------------------------------- // Process @@ -134,8 +134,8 @@ protected: void set_lp_coeffs(float fc, float q, float sr, int i, float gain); void set_hp_coeffs(float fc, float q, float sr, int i, float gain); - void d_activate() override; - void d_run(const float** inputs, float** outputs, uint32_t frames) override; + void activate() override; + void run(const float** inputs, float** outputs, uint32_t frames) override; // ------------------------------------------------------------------- diff --git a/plugins/ZaMultiComp/ZaMultiCompUI.cpp b/plugins/ZaMultiComp/ZaMultiCompUI.cpp index 39ea785..8bea548 100644 --- a/plugins/ZaMultiComp/ZaMultiCompUI.cpp +++ b/plugins/ZaMultiComp/ZaMultiCompUI.cpp @@ -180,13 +180,13 @@ ZaMultiCompUI::ZaMultiCompUI() fToggleListen1->setCallback(this); // set default values - d_programChanged(0); + programLoaded(0); } // ----------------------------------------------------------------------- // DSP Callbacks -void ZaMultiCompUI::d_parameterChanged(uint32_t index, float value) +void ZaMultiCompUI::parameterChanged(uint32_t index, float value) { switch (index) { @@ -272,7 +272,7 @@ void ZaMultiCompUI::d_parameterChanged(uint32_t index, float value) } } -void ZaMultiCompUI::d_programChanged(uint32_t index) +void ZaMultiCompUI::programLoaded(uint32_t index) { if (index != 0) return; @@ -305,96 +305,96 @@ void ZaMultiCompUI::d_programChanged(uint32_t index) void ZaMultiCompUI::imageKnobDragStarted(ImageKnob* knob) { if (knob == fKnobAttack) - d_editParameter(ZaMultiCompPlugin::paramAttack, true); + editParameter(ZaMultiCompPlugin::paramAttack, true); else if (knob == fKnobRelease) - d_editParameter(ZaMultiCompPlugin::paramRelease, true); + editParameter(ZaMultiCompPlugin::paramRelease, true); else if (knob == fKnobThresh) - d_editParameter(ZaMultiCompPlugin::paramThresh, true); + editParameter(ZaMultiCompPlugin::paramThresh, true); else if (knob == fKnobRatio) - d_editParameter(ZaMultiCompPlugin::paramRatio, true); + editParameter(ZaMultiCompPlugin::paramRatio, true); else if (knob == fKnobKnee) - d_editParameter(ZaMultiCompPlugin::paramKnee, true); + editParameter(ZaMultiCompPlugin::paramKnee, true); else if (knob == fKnobGlobalGain) - d_editParameter(ZaMultiCompPlugin::paramGlobalGain, true); + editParameter(ZaMultiCompPlugin::paramGlobalGain, true); else if (knob == fKnobMakeup1) - d_editParameter(ZaMultiCompPlugin::paramMakeup1, true); + editParameter(ZaMultiCompPlugin::paramMakeup1, true); else if (knob == fKnobMakeup2) - d_editParameter(ZaMultiCompPlugin::paramMakeup2, true); + editParameter(ZaMultiCompPlugin::paramMakeup2, true); else if (knob == fKnobMakeup3) - d_editParameter(ZaMultiCompPlugin::paramMakeup3, true); + editParameter(ZaMultiCompPlugin::paramMakeup3, true); else if (knob == fKnobXover1) - d_editParameter(ZaMultiCompPlugin::paramXover1, true); + editParameter(ZaMultiCompPlugin::paramXover1, true); else if (knob == fKnobXover2) - d_editParameter(ZaMultiCompPlugin::paramXover2, true); + editParameter(ZaMultiCompPlugin::paramXover2, true); } void ZaMultiCompUI::imageKnobDragFinished(ImageKnob* knob) { if (knob == fKnobAttack) - d_editParameter(ZaMultiCompPlugin::paramAttack, false); + editParameter(ZaMultiCompPlugin::paramAttack, false); else if (knob == fKnobRelease) - d_editParameter(ZaMultiCompPlugin::paramRelease, false); + editParameter(ZaMultiCompPlugin::paramRelease, false); else if (knob == fKnobThresh) - d_editParameter(ZaMultiCompPlugin::paramThresh, false); + editParameter(ZaMultiCompPlugin::paramThresh, false); else if (knob == fKnobRatio) - d_editParameter(ZaMultiCompPlugin::paramRatio, false); + editParameter(ZaMultiCompPlugin::paramRatio, false); else if (knob == fKnobKnee) - d_editParameter(ZaMultiCompPlugin::paramKnee, false); + editParameter(ZaMultiCompPlugin::paramKnee, false); else if (knob == fKnobGlobalGain) - d_editParameter(ZaMultiCompPlugin::paramGlobalGain, false); + editParameter(ZaMultiCompPlugin::paramGlobalGain, false); else if (knob == fKnobMakeup1) - d_editParameter(ZaMultiCompPlugin::paramMakeup1, false); + editParameter(ZaMultiCompPlugin::paramMakeup1, false); else if (knob == fKnobMakeup2) - d_editParameter(ZaMultiCompPlugin::paramMakeup2, false); + editParameter(ZaMultiCompPlugin::paramMakeup2, false); else if (knob == fKnobMakeup3) - d_editParameter(ZaMultiCompPlugin::paramMakeup3, false); + editParameter(ZaMultiCompPlugin::paramMakeup3, false); else if (knob == fKnobXover1) - d_editParameter(ZaMultiCompPlugin::paramXover1, false); + editParameter(ZaMultiCompPlugin::paramXover1, false); else if (knob == fKnobXover2) - d_editParameter(ZaMultiCompPlugin::paramXover2, false); + editParameter(ZaMultiCompPlugin::paramXover2, false); } void ZaMultiCompUI::imageKnobValueChanged(ImageKnob* knob, float value) { if (knob == fKnobAttack) - d_setParameterValue(ZaMultiCompPlugin::paramAttack, value); + setParameterValue(ZaMultiCompPlugin::paramAttack, value); else if (knob == fKnobRelease) - d_setParameterValue(ZaMultiCompPlugin::paramRelease, value); + setParameterValue(ZaMultiCompPlugin::paramRelease, value); else if (knob == fKnobThresh) - d_setParameterValue(ZaMultiCompPlugin::paramThresh, value); + setParameterValue(ZaMultiCompPlugin::paramThresh, value); else if (knob == fKnobRatio) - d_setParameterValue(ZaMultiCompPlugin::paramRatio, value); + setParameterValue(ZaMultiCompPlugin::paramRatio, value); else if (knob == fKnobKnee) - d_setParameterValue(ZaMultiCompPlugin::paramKnee, value); + setParameterValue(ZaMultiCompPlugin::paramKnee, value); else if (knob == fKnobGlobalGain) - d_setParameterValue(ZaMultiCompPlugin::paramGlobalGain, value); + setParameterValue(ZaMultiCompPlugin::paramGlobalGain, value); else if (knob == fKnobMakeup1) - d_setParameterValue(ZaMultiCompPlugin::paramMakeup1, value); + setParameterValue(ZaMultiCompPlugin::paramMakeup1, value); else if (knob == fKnobMakeup2) - d_setParameterValue(ZaMultiCompPlugin::paramMakeup2, value); + setParameterValue(ZaMultiCompPlugin::paramMakeup2, value); else if (knob == fKnobMakeup3) - d_setParameterValue(ZaMultiCompPlugin::paramMakeup3, value); + setParameterValue(ZaMultiCompPlugin::paramMakeup3, value); else if (knob == fKnobXover1) - d_setParameterValue(ZaMultiCompPlugin::paramXover1, value); + setParameterValue(ZaMultiCompPlugin::paramXover1, value); else if (knob == fKnobXover2) - d_setParameterValue(ZaMultiCompPlugin::paramXover2, value); + setParameterValue(ZaMultiCompPlugin::paramXover2, value); } void ZaMultiCompUI::imageToggleClicked(ImageToggle* toggle, int) { float v = toggle->getValue(); if (toggle == fToggleBypass1) - d_setParameterValue(ZaMultiCompPlugin::paramToggle1, v); + setParameterValue(ZaMultiCompPlugin::paramToggle1, v); else if (toggle == fToggleBypass2) - d_setParameterValue(ZaMultiCompPlugin::paramToggle2, v); + setParameterValue(ZaMultiCompPlugin::paramToggle2, v); else if (toggle == fToggleBypass3) - d_setParameterValue(ZaMultiCompPlugin::paramToggle3, v); + setParameterValue(ZaMultiCompPlugin::paramToggle3, v); else if (toggle == fToggleListen1) - d_setParameterValue(ZaMultiCompPlugin::paramListen1, v); + setParameterValue(ZaMultiCompPlugin::paramListen1, v); else if (toggle == fToggleListen2) - d_setParameterValue(ZaMultiCompPlugin::paramListen2, v); + setParameterValue(ZaMultiCompPlugin::paramListen2, v); else if (toggle == fToggleListen3) - d_setParameterValue(ZaMultiCompPlugin::paramListen3, v); + setParameterValue(ZaMultiCompPlugin::paramListen3, v); } void ZaMultiCompUI::onDisplay() diff --git a/plugins/ZaMultiComp/ZaMultiCompUI.hpp b/plugins/ZaMultiComp/ZaMultiCompUI.hpp index 1ef3dc0..23f3789 100644 --- a/plugins/ZaMultiComp/ZaMultiCompUI.hpp +++ b/plugins/ZaMultiComp/ZaMultiCompUI.hpp @@ -44,8 +44,8 @@ protected: // ------------------------------------------------------------------- // DSP Callbacks - void d_parameterChanged(uint32_t index, float value) override; - void d_programChanged(uint32_t index) override; + void parameterChanged(uint32_t index, float value) override; + void programLoaded(uint32_t index) override; // ------------------------------------------------------------------- // Widget Callbacks diff --git a/plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.cpp b/plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.cpp index 4504d99..6e46d65 100644 --- a/plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.cpp +++ b/plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.cpp @@ -25,13 +25,13 @@ ZaMultiCompX2Plugin::ZaMultiCompX2Plugin() : Plugin(paramCount, 2, 0) { // set default values - d_setProgram(0); + loadProgram(0); } // ----------------------------------------------------------------------- // Init -void ZaMultiCompX2Plugin::d_initParameter(uint32_t index, Parameter& parameter) +void ZaMultiCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) { switch (index) { @@ -263,7 +263,7 @@ void ZaMultiCompX2Plugin::d_initParameter(uint32_t index, Parameter& parameter) } } -void ZaMultiCompX2Plugin::d_initProgramName(uint32_t index, d_string& programName) +void ZaMultiCompX2Plugin::initProgramName(uint32_t index, String& programName) { switch(index) { case 0: @@ -333,12 +333,19 @@ void ZaMultiCompX2Plugin::loadProgram(uint32_t index) outr = -45.0; break; } + /* Default variable values */ + maxL = 0.f; + maxR = 0.f; + limit = 0.f; + + /* reset filter values */ + activate(); } // ----------------------------------------------------------------------- // Internal data -float ZaMultiCompX2Plugin::d_getParameterValue(uint32_t index) const +float ZaMultiCompX2Plugin::getParameterValue(uint32_t index) const { switch (index) { @@ -422,7 +429,7 @@ float ZaMultiCompX2Plugin::d_getParameterValue(uint32_t index) const } } -void ZaMultiCompX2Plugin::d_setParameterValue(uint32_t index, float value) +void ZaMultiCompX2Plugin::setParameterValue(uint32_t index, float value) { switch (index) { @@ -516,34 +523,20 @@ void ZaMultiCompX2Plugin::d_setParameterValue(uint32_t index, float value) } } -void ZaMultiCompX2Plugin::d_setProgram(uint32_t index) -{ - /* Default parameter values */ - loadProgram(index); - - /* Default variable values */ - maxL = 0.f; - maxR = 0.f; - limit = 0.f; - - /* reset filter values */ - d_activate(); -} - -void ZaMultiCompX2Plugin::d_setState(const char*, const char*) +void ZaMultiCompX2Plugin::setState(const char*, const char*) { resetl = true; resetr = true; } -void ZaMultiCompX2Plugin::d_initState(unsigned int, d_string&, d_string&) +void ZaMultiCompX2Plugin::initState(unsigned int, String&, String&) { } // ----------------------------------------------------------------------- // Process -void ZaMultiCompX2Plugin::d_activate() +void ZaMultiCompX2Plugin::activate() { int i,j; for (i = 0; i < MAX_COMP; i++) @@ -613,7 +606,7 @@ void ZaMultiCompX2Plugin::set_hp_coeffs(float fc, float q, float sr, int i, int void ZaMultiCompX2Plugin::run_limit(float inL, float inR, float *outL, float *outR) { - float srate = d_getSampleRate(); + float srate = getSampleRate(); float width=0.01; float threshdb = -0.5; float attack_coeff = exp(-1000.f/(0.001 * srate)); @@ -692,7 +685,7 @@ void ZaMultiCompX2Plugin::run_limit(float inL, float inR, float *outL, float *ou void ZaMultiCompX2Plugin::run_comp(int k, float inL, float inR, float *outL, float *outR) { - float srate = d_getSampleRate(); + float srate = getSampleRate(); float width=(knee-0.99f)*6.f; float attack_coeff = exp(-1000.f/(attack * srate)); float release_coeff = exp(-1000.f/(release * srate)); @@ -792,9 +785,9 @@ void ZaMultiCompX2Plugin::run_comp(int k, float inL, float inR, float *outL, flo old_yg[1][k] = Ryg; } -void ZaMultiCompX2Plugin::d_run(const float** inputs, float** outputs, uint32_t frames) +void ZaMultiCompX2Plugin::run(const float** inputs, float** outputs, uint32_t frames) { - float srate = d_getSampleRate(); + float srate = getSampleRate(); float maxxL = maxL; float maxxR = maxR; diff --git a/plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.hpp b/plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.hpp index a7ee283..bfa525b 100644 --- a/plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.hpp +++ b/plugins/ZaMultiCompX2/ZaMultiCompX2Plugin.hpp @@ -83,27 +83,27 @@ protected: // ------------------------------------------------------------------- // Information - const char* d_getLabel() const noexcept override + const char* getLabel() const noexcept override { return "ZaMultiCompX2"; } - const char* d_getMaker() const noexcept override + const char* getMaker() const noexcept override { return "Damien Zammit"; } - const char* d_getLicense() const noexcept override + const char* getLicense() const noexcept override { return "GPL v2+"; } - uint32_t d_getVersion() const noexcept override + uint32_t getVersion() const noexcept override { return 0x1000; } - int64_t d_getUniqueId() const noexcept override + int64_t getUniqueId() const noexcept override { return d_cconst('Z', 'M', 'M', '2'); } @@ -111,19 +111,18 @@ protected: // ------------------------------------------------------------------- // Init - void d_initParameter(uint32_t index, Parameter& parameter) ; - void d_initProgramName(uint32_t index, d_string& programName) ; - void d_initState(uint32_t, d_string&, d_string&) override; + void initParameter(uint32_t index, Parameter& parameter) ; + void initProgramName(uint32_t index, String& programName) ; + void initState(uint32_t, String&, String&) override; // ------------------------------------------------------------------- // Internal data - float d_getParameterValue(uint32_t index) const override; - void d_setParameterValue(uint32_t index, float value) override; - void d_setProgram(uint32_t index) override; - void d_setState(const char* key, const char* value) override; + float getParameterValue(uint32_t index) const override; + void setParameterValue(uint32_t index, float value) override; + void loadProgram(uint32_t index) override; + void setState(const char* key, const char* value) override; - void loadProgram(uint32_t index); // ------------------------------------------------------------------- // Process @@ -150,8 +149,8 @@ protected: void set_lp_coeffs(float fc, float q, float sr, int i, int ch, float gain); void set_hp_coeffs(float fc, float q, float sr, int i, int ch, float gain); - void d_activate() override; - void d_run(const float** inputs, float** outputs, uint32_t frames) override; + void activate() override; + void run(const float** inputs, float** outputs, uint32_t frames) override; // ------------------------------------------------------------------- diff --git a/plugins/ZaMultiCompX2/ZaMultiCompX2UI.cpp b/plugins/ZaMultiCompX2/ZaMultiCompX2UI.cpp index 5bd92d3..9f82730 100644 --- a/plugins/ZaMultiCompX2/ZaMultiCompX2UI.cpp +++ b/plugins/ZaMultiCompX2/ZaMultiCompX2UI.cpp @@ -218,7 +218,7 @@ ZaMultiCompX2UI::ZaMultiCompX2UI() } // set default values - d_programChanged(0); + programLoaded(0); } void ZaMultiCompX2UI::compcurve(float in, int k, float *outx, float* outy) { @@ -274,7 +274,7 @@ void ZaMultiCompX2UI::calc_compcurves() { // ----------------------------------------------------------------------- // DSP Callbacks -void ZaMultiCompX2UI::d_parameterChanged(uint32_t index, float value) +void ZaMultiCompX2UI::parameterChanged(uint32_t index, float value) { switch (index) { @@ -409,7 +409,7 @@ void ZaMultiCompX2UI::d_parameterChanged(uint32_t index, float value) } } -void ZaMultiCompX2UI::d_programChanged(uint32_t index) +void ZaMultiCompX2UI::programLoaded(uint32_t index) { if (index != 0) return; @@ -436,7 +436,7 @@ void ZaMultiCompX2UI::d_programChanged(uint32_t index) fToggleStereo->setValue(0.0f); } -void ZaMultiCompX2UI::d_stateChanged(const char*, const char*) +void ZaMultiCompX2UI::stateChanged(const char*, const char*) { } @@ -446,141 +446,141 @@ void ZaMultiCompX2UI::d_stateChanged(const char*, const char*) void ZaMultiCompX2UI::imageKnobDragStarted(ImageKnob* knob) { if (knob == fKnobAttack) - d_editParameter(ZaMultiCompX2Plugin::paramAttack, true); + editParameter(ZaMultiCompX2Plugin::paramAttack, true); else if (knob == fKnobRelease) - d_editParameter(ZaMultiCompX2Plugin::paramRelease, true); + editParameter(ZaMultiCompX2Plugin::paramRelease, true); else if (knob == fKnobThresh1) - d_editParameter(ZaMultiCompX2Plugin::paramThresh1, true); + editParameter(ZaMultiCompX2Plugin::paramThresh1, true); else if (knob == fKnobThresh2) - d_editParameter(ZaMultiCompX2Plugin::paramThresh2, true); + editParameter(ZaMultiCompX2Plugin::paramThresh2, true); else if (knob == fKnobThresh3) - d_editParameter(ZaMultiCompX2Plugin::paramThresh3, true); + editParameter(ZaMultiCompX2Plugin::paramThresh3, true); else if (knob == fKnobRatio) - d_editParameter(ZaMultiCompX2Plugin::paramRatio, true); + editParameter(ZaMultiCompX2Plugin::paramRatio, true); else if (knob == fKnobKnee) - d_editParameter(ZaMultiCompX2Plugin::paramKnee, true); + editParameter(ZaMultiCompX2Plugin::paramKnee, true); else if (knob == fKnobGlobalGain) - d_editParameter(ZaMultiCompX2Plugin::paramGlobalGain, true); + editParameter(ZaMultiCompX2Plugin::paramGlobalGain, true); else if (knob == fKnobMakeup1) - d_editParameter(ZaMultiCompX2Plugin::paramMakeup1, true); + editParameter(ZaMultiCompX2Plugin::paramMakeup1, true); else if (knob == fKnobMakeup2) - d_editParameter(ZaMultiCompX2Plugin::paramMakeup2, true); + editParameter(ZaMultiCompX2Plugin::paramMakeup2, true); else if (knob == fKnobMakeup3) - d_editParameter(ZaMultiCompX2Plugin::paramMakeup3, true); + editParameter(ZaMultiCompX2Plugin::paramMakeup3, true); else if (knob == fKnobXover1) - d_editParameter(ZaMultiCompX2Plugin::paramXover1, true); + editParameter(ZaMultiCompX2Plugin::paramXover1, true); else if (knob == fKnobXover2) - d_editParameter(ZaMultiCompX2Plugin::paramXover2, true); + editParameter(ZaMultiCompX2Plugin::paramXover2, true); } void ZaMultiCompX2UI::imageKnobDragFinished(ImageKnob* knob) { if (knob == fKnobAttack) - d_editParameter(ZaMultiCompX2Plugin::paramAttack, false); + editParameter(ZaMultiCompX2Plugin::paramAttack, false); else if (knob == fKnobRelease) - d_editParameter(ZaMultiCompX2Plugin::paramRelease, false); + editParameter(ZaMultiCompX2Plugin::paramRelease, false); else if (knob == fKnobThresh1) - d_editParameter(ZaMultiCompX2Plugin::paramThresh1, false); + editParameter(ZaMultiCompX2Plugin::paramThresh1, false); else if (knob == fKnobThresh2) - d_editParameter(ZaMultiCompX2Plugin::paramThresh2, false); + editParameter(ZaMultiCompX2Plugin::paramThresh2, false); else if (knob == fKnobThresh3) - d_editParameter(ZaMultiCompX2Plugin::paramThresh3, false); + editParameter(ZaMultiCompX2Plugin::paramThresh3, false); else if (knob == fKnobRatio) - d_editParameter(ZaMultiCompX2Plugin::paramRatio, false); + editParameter(ZaMultiCompX2Plugin::paramRatio, false); else if (knob == fKnobKnee) - d_editParameter(ZaMultiCompX2Plugin::paramKnee, false); + editParameter(ZaMultiCompX2Plugin::paramKnee, false); else if (knob == fKnobGlobalGain) - d_editParameter(ZaMultiCompX2Plugin::paramGlobalGain, false); + editParameter(ZaMultiCompX2Plugin::paramGlobalGain, false); else if (knob == fKnobMakeup1) - d_editParameter(ZaMultiCompX2Plugin::paramMakeup1, false); + editParameter(ZaMultiCompX2Plugin::paramMakeup1, false); else if (knob == fKnobMakeup2) - d_editParameter(ZaMultiCompX2Plugin::paramMakeup2, false); + editParameter(ZaMultiCompX2Plugin::paramMakeup2, false); else if (knob == fKnobMakeup3) - d_editParameter(ZaMultiCompX2Plugin::paramMakeup3, false); + editParameter(ZaMultiCompX2Plugin::paramMakeup3, false); else if (knob == fKnobXover1) - d_editParameter(ZaMultiCompX2Plugin::paramXover1, false); + editParameter(ZaMultiCompX2Plugin::paramXover1, false); else if (knob == fKnobXover2) - d_editParameter(ZaMultiCompX2Plugin::paramXover2, false); + editParameter(ZaMultiCompX2Plugin::paramXover2, false); } void ZaMultiCompX2UI::imageKnobValueChanged(ImageKnob* knob, float value) { if (knob == fKnobAttack) - d_setParameterValue(ZaMultiCompX2Plugin::paramAttack, value); + setParameterValue(ZaMultiCompX2Plugin::paramAttack, value); else if (knob == fKnobRelease) - d_setParameterValue(ZaMultiCompX2Plugin::paramRelease, value); + setParameterValue(ZaMultiCompX2Plugin::paramRelease, value); else if (knob == fKnobThresh1) { - d_setParameterValue(ZaMultiCompX2Plugin::paramThresh1, value); + setParameterValue(ZaMultiCompX2Plugin::paramThresh1, value); fThresh[0] = value; } else if (knob == fKnobThresh2) { - d_setParameterValue(ZaMultiCompX2Plugin::paramThresh2, value); + setParameterValue(ZaMultiCompX2Plugin::paramThresh2, value); fThresh[1] = value; } else if (knob == fKnobThresh3) { - d_setParameterValue(ZaMultiCompX2Plugin::paramThresh3, value); + setParameterValue(ZaMultiCompX2Plugin::paramThresh3, value); fThresh[2] = value; } else if (knob == fKnobRatio) { - d_setParameterValue(ZaMultiCompX2Plugin::paramRatio, value); + setParameterValue(ZaMultiCompX2Plugin::paramRatio, value); fRatio = value; } else if (knob == fKnobKnee) { - d_setParameterValue(ZaMultiCompX2Plugin::paramKnee, value); + setParameterValue(ZaMultiCompX2Plugin::paramKnee, value); fKnee = value; } else if (knob == fKnobGlobalGain) { - d_setParameterValue(ZaMultiCompX2Plugin::paramGlobalGain, value); + setParameterValue(ZaMultiCompX2Plugin::paramGlobalGain, value); fMaster = value; } else if (knob == fKnobMakeup1) { - d_setParameterValue(ZaMultiCompX2Plugin::paramMakeup1, value); + setParameterValue(ZaMultiCompX2Plugin::paramMakeup1, value); fMakeup[0] = value; } else if (knob == fKnobMakeup2) { - d_setParameterValue(ZaMultiCompX2Plugin::paramMakeup2, value); + setParameterValue(ZaMultiCompX2Plugin::paramMakeup2, value); fMakeup[1] = value; } else if (knob == fKnobMakeup3) { - d_setParameterValue(ZaMultiCompX2Plugin::paramMakeup3, value); + setParameterValue(ZaMultiCompX2Plugin::paramMakeup3, value); fMakeup[2] = value; } else if (knob == fKnobXover1) - d_setParameterValue(ZaMultiCompX2Plugin::paramXover1, value); + setParameterValue(ZaMultiCompX2Plugin::paramXover1, value); else if (knob == fKnobXover2) - d_setParameterValue(ZaMultiCompX2Plugin::paramXover2, value); + setParameterValue(ZaMultiCompX2Plugin::paramXover2, value); } void ZaMultiCompX2UI::imageToggleClicked(ImageToggle* toggle, int) { float v = toggle->getValue(); if (toggle == fToggleBypass1) { - d_setParameterValue(ZaMultiCompX2Plugin::paramToggle1, v); + setParameterValue(ZaMultiCompX2Plugin::paramToggle1, v); fBypass[0] = v; } else if (toggle == fToggleBypass2) { - d_setParameterValue(ZaMultiCompX2Plugin::paramToggle2, v); + setParameterValue(ZaMultiCompX2Plugin::paramToggle2, v); fBypass[1] = v; } else if (toggle == fToggleBypass3) { - d_setParameterValue(ZaMultiCompX2Plugin::paramToggle3, v); + setParameterValue(ZaMultiCompX2Plugin::paramToggle3, v); fBypass[2] = v; } else if (toggle == fToggleListen1) - d_setParameterValue(ZaMultiCompX2Plugin::paramListen1, v); + setParameterValue(ZaMultiCompX2Plugin::paramListen1, v); else if (toggle == fToggleListen2) - d_setParameterValue(ZaMultiCompX2Plugin::paramListen2, v); + setParameterValue(ZaMultiCompX2Plugin::paramListen2, v); else if (toggle == fToggleListen3) - d_setParameterValue(ZaMultiCompX2Plugin::paramListen3, v); + setParameterValue(ZaMultiCompX2Plugin::paramListen3, v); else if (toggle == fToggleStereo) - d_setParameterValue(ZaMultiCompX2Plugin::paramStereoDet, v); + setParameterValue(ZaMultiCompX2Plugin::paramStereoDet, v); } void ZaMultiCompX2UI::onDisplay() { fImgBackground.draw(); - d_setState("stateMeterReset", ""); + setState("stateMeterReset", ""); // draw leds static const float sLedSpacing = 15.5f; diff --git a/plugins/ZaMultiCompX2/ZaMultiCompX2UI.hpp b/plugins/ZaMultiCompX2/ZaMultiCompX2UI.hpp index d9023f4..9afa5b5 100644 --- a/plugins/ZaMultiCompX2/ZaMultiCompX2UI.hpp +++ b/plugins/ZaMultiCompX2/ZaMultiCompX2UI.hpp @@ -52,9 +52,9 @@ protected: // ------------------------------------------------------------------- // DSP Callbacks - void d_parameterChanged(uint32_t index, float value) override; - void d_programChanged(uint32_t index) override; - void d_stateChanged(const char*, const char*) override; + void parameterChanged(uint32_t index, float value) override; + void programLoaded(uint32_t index) override; + void stateChanged(const char*, const char*) override; // ------------------------------------------------------------------- // Widget Callbacks diff --git a/plugins/ZamAutoSat/ZamAutoSatPlugin.cpp b/plugins/ZamAutoSat/ZamAutoSatPlugin.cpp index d617d07..1026cfe 100644 --- a/plugins/ZamAutoSat/ZamAutoSatPlugin.cpp +++ b/plugins/ZamAutoSat/ZamAutoSatPlugin.cpp @@ -25,10 +25,10 @@ ZamAutoSatPlugin::ZamAutoSatPlugin() : Plugin(paramCount, 1, 0) // 1 program, 0 states { // set default values - d_setProgram(0); + loadProgram(0); // reset - d_deactivate(); + deactivate(); } ZamAutoSatPlugin::~ZamAutoSatPlugin() @@ -38,11 +38,11 @@ ZamAutoSatPlugin::~ZamAutoSatPlugin() // ----------------------------------------------------------------------- // Init -void ZamAutoSatPlugin::d_initParameter(uint32_t, Parameter&) +void ZamAutoSatPlugin::initParameter(uint32_t, Parameter&) { } -void ZamAutoSatPlugin::d_initProgramName(uint32_t index, d_string& programName) +void ZamAutoSatPlugin::initProgramName(uint32_t index, String& programName) { if (index != 0) return; @@ -53,35 +53,35 @@ void ZamAutoSatPlugin::d_initProgramName(uint32_t index, d_string& programName) // ----------------------------------------------------------------------- // Internal data -float ZamAutoSatPlugin::d_getParameterValue(uint32_t) const +float ZamAutoSatPlugin::getParameterValue(uint32_t) const { return 0.0f; } -void ZamAutoSatPlugin::d_setParameterValue(uint32_t, float) +void ZamAutoSatPlugin::setParameterValue(uint32_t, float) { } -void ZamAutoSatPlugin::d_setProgram(uint32_t index) +void ZamAutoSatPlugin::loadProgram(uint32_t index) { if (index != 0) return; - d_activate(); + activate(); } // ----------------------------------------------------------------------- // Process -void ZamAutoSatPlugin::d_activate() +void ZamAutoSatPlugin::activate() { } -void ZamAutoSatPlugin::d_deactivate() +void ZamAutoSatPlugin::deactivate() { } -void ZamAutoSatPlugin::d_run(const float** inputs, float** outputs, uint32_t frames) +void ZamAutoSatPlugin::run(const float** inputs, float** outputs, uint32_t frames) { uint32_t i; for (i = 0; i < frames; i++) { diff --git a/plugins/ZamAutoSat/ZamAutoSatPlugin.hpp b/plugins/ZamAutoSat/ZamAutoSatPlugin.hpp index 0933397..5f4c1d4 100644 --- a/plugins/ZamAutoSat/ZamAutoSatPlugin.hpp +++ b/plugins/ZamAutoSat/ZamAutoSatPlugin.hpp @@ -39,27 +39,27 @@ protected: // -------------------------------------------------------------------
// Information
- const char* d_getLabel() const noexcept override
+ const char* getLabel() const noexcept override
{
return "ZamAutoSat";
}
- const char* d_getMaker() const noexcept override
+ const char* getMaker() const noexcept override
{
return "Damien Zammit";
}
- const char* d_getLicense() const noexcept override
+ const char* getLicense() const noexcept override
{
return "GPL v2+";
}
- uint32_t d_getVersion() const noexcept override
+ uint32_t getVersion() const noexcept override
{
return 0x1000;
}
- int64_t d_getUniqueId() const noexcept override
+ int64_t getUniqueId() const noexcept override
{
return d_cconst('Z', 'S', 'A', 'T');
}
@@ -67,20 +67,20 @@ protected: // -------------------------------------------------------------------
// Init
- void d_initParameter(uint32_t index, Parameter& parameter) ;
- void d_initProgramName(uint32_t index, d_string& programName) ;
+ void initParameter(uint32_t index, Parameter& parameter) override;
+ void initProgramName(uint32_t index, String& programName) override;
// -------------------------------------------------------------------
// Internal data
- float d_getParameterValue(uint32_t index) const ;
- void d_setParameterValue(uint32_t index, float value) ;
- void d_setProgram(uint32_t index) ;
+ float getParameterValue(uint32_t index) const override;
+ void setParameterValue(uint32_t index, float value) override;
+ void loadProgram(uint32_t index) override;
// -------------------------------------------------------------------
- void d_activate() ;
- void d_deactivate() ;
- void d_run(const float** inputs, float** outputs, uint32_t frames) override;
+ void activate() override;
+ void deactivate() override;
+ void run(const float** inputs, float** outputs, uint32_t frames) override;
// -------------------------------------------------------------------
diff --git a/plugins/ZamAutoSat/ZamAutoSatUI.cpp b/plugins/ZamAutoSat/ZamAutoSatUI.cpp index 2857f11..e6fac33 100644 --- a/plugins/ZamAutoSat/ZamAutoSatUI.cpp +++ b/plugins/ZamAutoSat/ZamAutoSatUI.cpp @@ -38,11 +38,11 @@ ZamAutoSatUI::~ZamAutoSatUI() // ----------------------------------------------------------------------- // DSP Callbacks -void ZamAutoSatUI::d_parameterChanged(uint32_t, float) +void ZamAutoSatUI::parameterChanged(uint32_t, float) { } -void ZamAutoSatUI::d_programChanged(uint32_t) +void ZamAutoSatUI::programLoaded(uint32_t) { } diff --git a/plugins/ZamAutoSat/ZamAutoSatUI.hpp b/plugins/ZamAutoSat/ZamAutoSatUI.hpp index 59cefa7..5ca0c29 100644 --- a/plugins/ZamAutoSat/ZamAutoSatUI.hpp +++ b/plugins/ZamAutoSat/ZamAutoSatUI.hpp @@ -41,8 +41,8 @@ protected: // ------------------------------------------------------------------- // DSP Callbacks - void d_parameterChanged(uint32_t index, float value) override; - void d_programChanged(uint32_t index) ; + void parameterChanged(uint32_t index, float value) override; + void programLoaded(uint32_t index) override; // ------------------------------------------------------------------- diff --git a/plugins/ZamChild670/ZamChild670Plugin.cpp b/plugins/ZamChild670/ZamChild670Plugin.cpp index 71a2378..7403723 100644 --- a/plugins/ZamChild670/ZamChild670Plugin.cpp +++ b/plugins/ZamChild670/ZamChild670Plugin.cpp @@ -34,8 +34,8 @@ ZamChild670Plugin::ZamChild670Plugin() ACThreshold, timeConstantSelect, DCThreshold, inputLevel, ACThreshold, timeConstantSelect, DCThreshold, true, false, true, outputGain, false); - zamchild = new Wavechild670(d_getSampleRate(), *params); - d_setProgram(0); + zamchild = new Wavechild670(getSampleRate(), *params); + loadProgram(0); } ZamChild670Plugin::~ZamChild670Plugin() @@ -47,7 +47,7 @@ ZamChild670Plugin::~ZamChild670Plugin() // ----------------------------------------------------------------------- // Init -void ZamChild670Plugin::d_initParameter(uint32_t index, Parameter& parameter) +void ZamChild670Plugin::initParameter(uint32_t index, Parameter& parameter) { switch (index) { @@ -99,7 +99,7 @@ void ZamChild670Plugin::d_initParameter(uint32_t index, Parameter& parameter) } } -void ZamChild670Plugin::d_initProgramName(uint32_t index, d_string& programName) +void ZamChild670Plugin::initProgramName(uint32_t index, String& programName) { if (index != 0) return; @@ -110,7 +110,7 @@ void ZamChild670Plugin::d_initProgramName(uint32_t index, d_string& programName) // ----------------------------------------------------------------------- // Internal data -float ZamChild670Plugin::d_getParameterValue(uint32_t index) const +float ZamChild670Plugin::getParameterValue(uint32_t index) const { switch (index) { @@ -134,7 +134,7 @@ float ZamChild670Plugin::d_getParameterValue(uint32_t index) const } } -void ZamChild670Plugin::d_setParameterValue(uint32_t index, float value) +void ZamChild670Plugin::setParameterValue(uint32_t index, float value) { switch (index) { @@ -156,7 +156,7 @@ void ZamChild670Plugin::d_setParameterValue(uint32_t index, float value) } } -void ZamChild670Plugin::d_setProgram(uint32_t index) +void ZamChild670Plugin::loadProgram(uint32_t index) { if (index != 0) return; @@ -169,13 +169,13 @@ void ZamChild670Plugin::d_setProgram(uint32_t index) outputGain = from_dB(0.0); /* reset filter values */ - d_activate(); + activate(); } // ----------------------------------------------------------------------- // Process -void ZamChild670Plugin::d_activate() +void ZamChild670Plugin::activate() { params->inputLevelA = params->inputLevelB = from_dB(inputLevel); params->ACThresholdA = params->ACThresholdB = ACThreshold; @@ -186,7 +186,7 @@ void ZamChild670Plugin::d_activate() zamchild->warmUp(); } -void ZamChild670Plugin::d_run(const float** inputs, float** outputs, uint32_t frames) +void ZamChild670Plugin::run(const float** inputs, float** outputs, uint32_t frames) { params->inputLevelA = params->inputLevelB = from_dB(inputLevel); params->ACThresholdA = params->ACThresholdB = ACThreshold; diff --git a/plugins/ZamChild670/ZamChild670Plugin.hpp b/plugins/ZamChild670/ZamChild670Plugin.hpp index 762d547..1900ca9 100644 --- a/plugins/ZamChild670/ZamChild670Plugin.hpp +++ b/plugins/ZamChild670/ZamChild670Plugin.hpp @@ -45,27 +45,27 @@ protected: // ------------------------------------------------------------------- // Information - const char* d_getLabel() const noexcept override + const char* getLabel() const noexcept override { return "ZamChild670"; } - const char* d_getMaker() const noexcept override + const char* getMaker() const noexcept override { return "Damien Zammit"; } - const char* d_getLicense() const noexcept override + const char* getLicense() const noexcept override { return "GPL v2+"; } - uint32_t d_getVersion() const noexcept override + uint32_t getVersion() const noexcept override { return 0x1000; } - int64_t d_getUniqueId() const noexcept override + int64_t getUniqueId() const noexcept override { return d_cconst('Z', 'C', 'L', 'D'); } @@ -73,15 +73,15 @@ protected: // ------------------------------------------------------------------- // Init - void d_initParameter(uint32_t index, Parameter& parameter) override; - void d_initProgramName(uint32_t index, d_string& programName) override; + void initParameter(uint32_t index, Parameter& parameter) override; + void initProgramName(uint32_t index, String& programName) override; // ------------------------------------------------------------------- // Internal data - float d_getParameterValue(uint32_t index) const override; - void d_setParameterValue(uint32_t index, float value) override; - void d_setProgram(uint32_t index) override; + float getParameterValue(uint32_t index) const override; + void setParameterValue(uint32_t index, float value) override; + void loadProgram(uint32_t index) override; // ------------------------------------------------------------------- // Process @@ -103,8 +103,8 @@ protected: return (20.f*log10(g)); } - void d_activate() override; - void d_run(const float** inputs, float** outputs, uint32_t frames) override; + void activate() override; + void run(const float** inputs, float** outputs, uint32_t frames) override; // ------------------------------------------------------------------- diff --git a/plugins/ZamChild670/ZamChild670UI.cpp b/plugins/ZamChild670/ZamChild670UI.cpp index 8416781..8b602a1 100644 --- a/plugins/ZamChild670/ZamChild670UI.cpp +++ b/plugins/ZamChild670/ZamChild670UI.cpp @@ -67,13 +67,13 @@ ZamChild670UI::ZamChild670UI() fKnobOutgain->setCallback(this); // set default values - d_programChanged(0); + programLoaded(0); } // ----------------------------------------------------------------------- // DSP Callbacks -void ZamChild670UI::d_parameterChanged(uint32_t index, float value) +void ZamChild670UI::parameterChanged(uint32_t index, float value) { switch (index) { @@ -92,7 +92,7 @@ void ZamChild670UI::d_parameterChanged(uint32_t index, float value) } } -void ZamChild670UI::d_programChanged(uint32_t) +void ZamChild670UI::programLoaded(uint32_t) { // Default values fKnobIngain->setValue(-12.0f); @@ -106,17 +106,17 @@ void ZamChild670UI::d_programChanged(uint32_t) void ZamChild670UI::imageKnobDragStarted(ImageKnob* knob) { - d_editParameter(knob->getId(), true); + editParameter(knob->getId(), true); } void ZamChild670UI::imageKnobDragFinished(ImageKnob* knob) { - d_editParameter(knob->getId(), false); + editParameter(knob->getId(), false); } void ZamChild670UI::imageKnobValueChanged(ImageKnob* knob, float value) { - d_setParameterValue(knob->getId(), value); + setParameterValue(knob->getId(), value); } void ZamChild670UI::onDisplay() diff --git a/plugins/ZamChild670/ZamChild670UI.hpp b/plugins/ZamChild670/ZamChild670UI.hpp index 292f67e..80abe9c 100644 --- a/plugins/ZamChild670/ZamChild670UI.hpp +++ b/plugins/ZamChild670/ZamChild670UI.hpp @@ -40,8 +40,8 @@ protected: // ------------------------------------------------------------------- // DSP Callbacks - void d_parameterChanged(uint32_t index, float value) override; - void d_programChanged(uint32_t index) override; + void parameterChanged(uint32_t index, float value) override; + void programLoaded(uint32_t index) override; // ------------------------------------------------------------------- // Widget Callbacks diff --git a/plugins/ZamCompX2/ZamCompX2Plugin.cpp b/plugins/ZamCompX2/ZamCompX2Plugin.cpp index 00f1160..b31936c 100644 --- a/plugins/ZamCompX2/ZamCompX2Plugin.cpp +++ b/plugins/ZamCompX2/ZamCompX2Plugin.cpp @@ -25,13 +25,13 @@ ZamCompX2Plugin::ZamCompX2Plugin() : Plugin(paramCount, 3, 0) { // set default values - d_setProgram(0); + loadProgram(0); } // ----------------------------------------------------------------------- // Init -void ZamCompX2Plugin::d_initParameter(uint32_t index, Parameter& parameter) +void ZamCompX2Plugin::initParameter(uint32_t index, Parameter& parameter) { switch (index) { @@ -120,7 +120,7 @@ void ZamCompX2Plugin::d_initParameter(uint32_t index, Parameter& parameter) } -void ZamCompX2Plugin::d_initProgramName(uint32_t index, d_string& programName) +void ZamCompX2Plugin::initProgramName(uint32_t index, String& programName) { switch(index) { case 0: @@ -172,12 +172,14 @@ void ZamCompX2Plugin::loadProgram(uint32_t index) outlevel = -45.0; break; } + /* reset filter values */ + activate(); } // ----------------------------------------------------------------------- // Internal data -float ZamCompX2Plugin::d_getParameterValue(uint32_t index) const +float ZamCompX2Plugin::getParameterValue(uint32_t index) const { switch (index) { @@ -213,7 +215,7 @@ float ZamCompX2Plugin::d_getParameterValue(uint32_t index) const } } -void ZamCompX2Plugin::d_setParameterValue(uint32_t index, float value) +void ZamCompX2Plugin::setParameterValue(uint32_t index, float value) { switch (index) { @@ -247,28 +249,19 @@ void ZamCompX2Plugin::d_setParameterValue(uint32_t index, float value) } } -void ZamCompX2Plugin::d_setProgram(uint32_t index) -{ - /* Default parameter values */ - loadProgram(index); - - /* reset filter values */ - d_activate(); -} - // ----------------------------------------------------------------------- // Process -void ZamCompX2Plugin::d_activate() +void ZamCompX2Plugin::activate() { gainred = 0.0f; outlevel = -45.0f; oldL_yl = oldL_y1 = oldR_yl = oldR_y1 = oldL_yg = oldR_yg = 0.f; } -void ZamCompX2Plugin::d_run(const float** inputs, float** outputs, uint32_t frames) +void ZamCompX2Plugin::run(const float** inputs, float** outputs, uint32_t frames) { - float srate = d_getSampleRate(); + float srate = getSampleRate(); float width=(knee-0.99f)*6.f; float cdb=0.f; float attack_coeff = exp(-1000.f/(attack * srate)); diff --git a/plugins/ZamCompX2/ZamCompX2Plugin.hpp b/plugins/ZamCompX2/ZamCompX2Plugin.hpp index 82e8b6e..5d14ccb 100644 --- a/plugins/ZamCompX2/ZamCompX2Plugin.hpp +++ b/plugins/ZamCompX2/ZamCompX2Plugin.hpp @@ -51,27 +51,27 @@ protected: // ------------------------------------------------------------------- // Information - const char* d_getLabel() const noexcept override + const char* getLabel() const noexcept override { return "ZamCompX2"; } - const char* d_getMaker() const noexcept override + const char* getMaker() const noexcept override { return "Damien Zammit"; } - const char* d_getLicense() const noexcept override + const char* getLicense() const noexcept override { return "GPL v2+"; } - uint32_t d_getVersion() const noexcept override + uint32_t getVersion() const noexcept override { return 0x1000; } - int64_t d_getUniqueId() const noexcept override + int64_t getUniqueId() const noexcept override { return d_cconst('Z', 'C', 'P', '2'); } @@ -79,17 +79,15 @@ protected: // ------------------------------------------------------------------- // Init - void d_initParameter(uint32_t index, Parameter& parameter) override; - void d_initProgramName(uint32_t index, d_string& programName) override; + void initParameter(uint32_t index, Parameter& parameter) override; + void initProgramName(uint32_t index, String& programName) override; // ------------------------------------------------------------------- // Internal data - float d_getParameterValue(uint32_t index) const override; - void d_setParameterValue(uint32_t index, float value) override; - void d_setProgram(uint32_t index) override; - - void loadProgram(uint32_t index); + float getParameterValue(uint32_t index) const override; + void setParameterValue(uint32_t index, float value) override; + void loadProgram(uint32_t index) override; // ------------------------------------------------------------------- // Process @@ -111,8 +109,8 @@ protected: return (20.f*log10(g)); } - void d_activate() override; - void d_run(const float** inputs, float** outputs, uint32_t frames) override; + void activate() override; + void run(const float** inputs, float** outputs, uint32_t frames) override; // ------------------------------------------------------------------- diff --git a/plugins/ZamCompX2/ZamCompX2UI.cpp b/plugins/ZamCompX2/ZamCompX2UI.cpp index 36b7a7f..7c4bcfc 100644 --- a/plugins/ZamCompX2/ZamCompX2UI.cpp +++ b/plugins/ZamCompX2/ZamCompX2UI.cpp @@ -108,13 +108,13 @@ ZamCompX2UI::ZamCompX2UI() fToggleStereo->setCallback(this); // set default values - d_programChanged(0); + programLoaded(0); } // ----------------------------------------------------------------------- // DSP Callbacks -void ZamCompX2UI::d_parameterChanged(uint32_t index, float value) +void ZamCompX2UI::parameterChanged(uint32_t index, float value) { switch (index) { @@ -156,7 +156,7 @@ void ZamCompX2UI::d_parameterChanged(uint32_t index, float value) } } -void ZamCompX2UI::d_programChanged(uint32_t index) +void ZamCompX2UI::programLoaded(uint32_t index) { if (index != 0) return; @@ -176,24 +176,24 @@ void ZamCompX2UI::d_programChanged(uint32_t index) void ZamCompX2UI::imageKnobDragStarted(ImageKnob* knob) { - d_editParameter(knob->getId(), true); + editParameter(knob->getId(), true); } void ZamCompX2UI::imageKnobDragFinished(ImageKnob* knob) { - d_editParameter(knob->getId(), false); + editParameter(knob->getId(), false); } void ZamCompX2UI::imageKnobValueChanged(ImageKnob* knob, float value) { - d_setParameterValue(knob->getId(), value); + setParameterValue(knob->getId(), value); } void ZamCompX2UI::imageToggleClicked(ImageToggle* imageToggle, int) { int flip = !imageToggle->getValue(); if (imageToggle == fToggleStereo) - d_setParameterValue(ZamCompX2Plugin::paramStereo, flip); + setParameterValue(ZamCompX2Plugin::paramStereo, flip); } void ZamCompX2UI::onDisplay() diff --git a/plugins/ZamCompX2/ZamCompX2UI.hpp b/plugins/ZamCompX2/ZamCompX2UI.hpp index 9eb1edb..53a03fe 100644 --- a/plugins/ZamCompX2/ZamCompX2UI.hpp +++ b/plugins/ZamCompX2/ZamCompX2UI.hpp @@ -44,8 +44,8 @@ protected: // ------------------------------------------------------------------- // DSP Callbacks - void d_parameterChanged(uint32_t index, float value) override; - void d_programChanged(uint32_t index) override; + void parameterChanged(uint32_t index, float value) override; + void programLoaded(uint32_t index) override; // ------------------------------------------------------------------- // Widget Callbacks diff --git a/plugins/ZamEQ2/ZamEQ2Plugin.cpp b/plugins/ZamEQ2/ZamEQ2Plugin.cpp index 8fa0207..126d039 100644 --- a/plugins/ZamEQ2/ZamEQ2Plugin.cpp +++ b/plugins/ZamEQ2/ZamEQ2Plugin.cpp @@ -25,13 +25,13 @@ ZamEQ2Plugin::ZamEQ2Plugin() : Plugin(paramCount, 4, 0) { // set default values - d_setProgram(0); + loadProgram(0); } // ----------------------------------------------------------------------- // Init -void ZamEQ2Plugin::d_initParameter(uint32_t index, Parameter& parameter) +void ZamEQ2Plugin::initParameter(uint32_t index, Parameter& parameter) { switch (index) { @@ -146,7 +146,7 @@ void ZamEQ2Plugin::d_initParameter(uint32_t index, Parameter& parameter) } } -void ZamEQ2Plugin::d_initProgramName(uint32_t index, d_string& programName) +void ZamEQ2Plugin::initProgramName(uint32_t index, String& programName) { switch(index) { case 0: @@ -224,12 +224,14 @@ void ZamEQ2Plugin::loadProgram(uint32_t index) togglepeaks = 0.0; break; } + /* reset filter values */ + activate(); } // ----------------------------------------------------------------------- // Internal data -float ZamEQ2Plugin::d_getParameterValue(uint32_t index) const +float ZamEQ2Plugin::getParameterValue(uint32_t index) const { switch (index) { @@ -274,7 +276,7 @@ float ZamEQ2Plugin::d_getParameterValue(uint32_t index) const } } -void ZamEQ2Plugin::d_setParameterValue(uint32_t index, float value) +void ZamEQ2Plugin::setParameterValue(uint32_t index, float value) { switch (index) { @@ -317,19 +319,10 @@ void ZamEQ2Plugin::d_setParameterValue(uint32_t index, float value) } } -void ZamEQ2Plugin::d_setProgram(uint32_t index) -{ - /* Default parameter values */ - loadProgram(index); - - /* reset filter values */ - d_activate(); -} - // ----------------------------------------------------------------------- // Process -void ZamEQ2Plugin::d_activate() +void ZamEQ2Plugin::activate() { int i; for (i = 0; i < MAX_FILT; ++i) { @@ -436,9 +429,9 @@ float ZamEQ2Plugin::run_filter(int i, int ch, double in) return (float) out; } -void ZamEQ2Plugin::d_run(const float** inputs, float** outputs, uint32_t frames) +void ZamEQ2Plugin::run(const float** inputs, float** outputs, uint32_t frames) { - float srate = d_getSampleRate(); + float srate = getSampleRate(); lowshelf(0, 0, srate, freql, gainl); peq(1, 0, srate, freq1, gain1, q1); diff --git a/plugins/ZamEQ2/ZamEQ2Plugin.hpp b/plugins/ZamEQ2/ZamEQ2Plugin.hpp index 2f67244..1597a05 100644 --- a/plugins/ZamEQ2/ZamEQ2Plugin.hpp +++ b/plugins/ZamEQ2/ZamEQ2Plugin.hpp @@ -52,27 +52,27 @@ protected: // ------------------------------------------------------------------- // Information - const char* d_getLabel() const noexcept override + const char* getLabel() const noexcept override { return "ZamEQ2"; } - const char* d_getMaker() const noexcept override + const char* getMaker() const noexcept override { return "Damien Zammit"; } - const char* d_getLicense() const noexcept override + const char* getLicense() const noexcept override { return "GPL v2+"; } - uint32_t d_getVersion() const noexcept override + uint32_t getVersion() const noexcept override { return 0x1000; } - int64_t d_getUniqueId() const noexcept override + int64_t getUniqueId() const noexcept override { return d_cconst('Z', 'E', 'Q', '2'); } @@ -80,17 +80,15 @@ protected: // ------------------------------------------------------------------- // Init - void d_initParameter(uint32_t index, Parameter& parameter) ; - void d_initProgramName(uint32_t index, d_string& programName) ; + void initParameter(uint32_t index, Parameter& parameter) ; + void initProgramName(uint32_t index, String& programName) ; // ------------------------------------------------------------------- // Internal data - float d_getParameterValue(uint32_t index) const override; - void d_setParameterValue(uint32_t index, float value) override; - void d_setProgram(uint32_t index) override; - - void loadProgram(uint32_t index); + float getParameterValue(uint32_t index) const override; + void setParameterValue(uint32_t index, float value) override; + void loadProgram(uint32_t index) override; // ------------------------------------------------------------------- // Process @@ -117,8 +115,8 @@ protected: return (x >= 0.f ? 1 : -1); } - void d_activate() override; - void d_run(const float** inputs, float** outputs, uint32_t frames) override; + void activate() override; + void run(const float** inputs, float** outputs, uint32_t frames) override; void peq(int i, int ch, float srate, float fc, float g, float bw); void lowshelf(int i, int ch, float srate, float fc, float g); diff --git a/plugins/ZamEQ2/ZamEQ2UI.cpp b/plugins/ZamEQ2/ZamEQ2UI.cpp index ba7f543..37722fd 100644 --- a/plugins/ZamEQ2/ZamEQ2UI.cpp +++ b/plugins/ZamEQ2/ZamEQ2UI.cpp @@ -127,13 +127,13 @@ ZamEQ2UI::ZamEQ2UI() fCanvasArea.setSize(305,180); // set default values - d_programChanged(0); + programLoaded(0); } // ----------------------------------------------------------------------- // DSP Callbacks -void ZamEQ2UI::d_parameterChanged(uint32_t index, float value) +void ZamEQ2UI::parameterChanged(uint32_t index, float value) { switch (index) { @@ -173,7 +173,7 @@ void ZamEQ2UI::d_parameterChanged(uint32_t index, float value) } } -void ZamEQ2UI::d_programChanged(uint32_t index) +void ZamEQ2UI::programLoaded(uint32_t index) { if (index != 0) return; @@ -199,91 +199,91 @@ void ZamEQ2UI::d_programChanged(uint32_t index) void ZamEQ2UI::imageKnobDragStarted(ImageKnob* knob) { if (knob == fKnobGain1) - d_editParameter(ZamEQ2Plugin::paramGain1, true); + editParameter(ZamEQ2Plugin::paramGain1, true); else if (knob == fKnobQ1) - d_editParameter(ZamEQ2Plugin::paramQ1, true); + editParameter(ZamEQ2Plugin::paramQ1, true); else if (knob == fKnobFreq1) - d_editParameter(ZamEQ2Plugin::paramFreq1, true); + editParameter(ZamEQ2Plugin::paramFreq1, true); else if (knob == fKnobGain2) - d_editParameter(ZamEQ2Plugin::paramGain2, true); + editParameter(ZamEQ2Plugin::paramGain2, true); else if (knob == fKnobQ2) - d_editParameter(ZamEQ2Plugin::paramQ2, true); + editParameter(ZamEQ2Plugin::paramQ2, true); else if (knob == fKnobFreq2) - d_editParameter(ZamEQ2Plugin::paramFreq2, true); + editParameter(ZamEQ2Plugin::paramFreq2, true); else if (knob == fKnobGainL) - d_editParameter(ZamEQ2Plugin::paramGainL, true); + editParameter(ZamEQ2Plugin::paramGainL, true); else if (knob == fKnobFreqL) - d_editParameter(ZamEQ2Plugin::paramFreqL, true); + editParameter(ZamEQ2Plugin::paramFreqL, true); else if (knob == fKnobGainH) - d_editParameter(ZamEQ2Plugin::paramGainH, true); + editParameter(ZamEQ2Plugin::paramGainH, true); else if (knob == fKnobFreqH) - d_editParameter(ZamEQ2Plugin::paramFreqH, true); + editParameter(ZamEQ2Plugin::paramFreqH, true); } void ZamEQ2UI::imageKnobDragFinished(ImageKnob* knob) { if (knob == fKnobGain1) - d_editParameter(ZamEQ2Plugin::paramGain1, false); + editParameter(ZamEQ2Plugin::paramGain1, false); else if (knob == fKnobQ1) - d_editParameter(ZamEQ2Plugin::paramQ1, false); + editParameter(ZamEQ2Plugin::paramQ1, false); else if (knob == fKnobFreq1) - d_editParameter(ZamEQ2Plugin::paramFreq1, false); + editParameter(ZamEQ2Plugin::paramFreq1, false); else if (knob == fKnobGain2) - d_editParameter(ZamEQ2Plugin::paramGain2, false); + editParameter(ZamEQ2Plugin::paramGain2, false); else if (knob == fKnobQ2) - d_editParameter(ZamEQ2Plugin::paramQ2, false); + editParameter(ZamEQ2Plugin::paramQ2, false); else if (knob == fKnobFreq2) - d_editParameter(ZamEQ2Plugin::paramFreq2, false); + editParameter(ZamEQ2Plugin::paramFreq2, false); else if (knob == fKnobGainL) - d_editParameter(ZamEQ2Plugin::paramGainL, false); + editParameter(ZamEQ2Plugin::paramGainL, false); else if (knob == fKnobFreqL) - d_editParameter(ZamEQ2Plugin::paramFreqL, false); + editParameter(ZamEQ2Plugin::paramFreqL, false); else if (knob == fKnobGainH) - d_editParameter(ZamEQ2Plugin::paramGainH, false); + editParameter(ZamEQ2Plugin::paramGainH, false); else if (knob == fKnobFreqH) - d_editParameter(ZamEQ2Plugin::paramFreqH, false); + editParameter(ZamEQ2Plugin::paramFreqH, false); } void ZamEQ2UI::imageKnobValueChanged(ImageKnob* knob, float value) { if (knob == fKnobGain1) - d_setParameterValue(ZamEQ2Plugin::paramGain1, value); + setParameterValue(ZamEQ2Plugin::paramGain1, value); else if (knob == fKnobQ1) - d_setParameterValue(ZamEQ2Plugin::paramQ1, value); + setParameterValue(ZamEQ2Plugin::paramQ1, value); else if (knob == fKnobFreq1) - d_setParameterValue(ZamEQ2Plugin::paramFreq1, value); + setParameterValue(ZamEQ2Plugin::paramFreq1, value); else if (knob == fKnobGain2) - d_setParameterValue(ZamEQ2Plugin::paramGain2, value); + setParameterValue(ZamEQ2Plugin::paramGain2, value); else if (knob == fKnobQ2) - d_setParameterValue(ZamEQ2Plugin::paramQ2, value); + setParameterValue(ZamEQ2Plugin::paramQ2, value); else if (knob == fKnobFreq2) - d_setParameterValue(ZamEQ2Plugin::paramFreq2, value); + setParameterValue(ZamEQ2Plugin::paramFreq2, value); else if (knob == fKnobGainL) - d_setParameterValue(ZamEQ2Plugin::paramGainL, value); + setParameterValue(ZamEQ2Plugin::paramGainL, value); else if (knob == fKnobFreqL) - d_setParameterValue(ZamEQ2Plugin::paramFreqL, value); + setParameterValue(ZamEQ2Plugin::paramFreqL, value); else if (knob == fKnobGainH) - d_setParameterValue(ZamEQ2Plugin::paramGainH, value); + setParameterValue(ZamEQ2Plugin::paramGainH, value); else if (knob == fKnobFreqH) - d_setParameterValue(ZamEQ2Plugin::paramFreqH, value); + setParameterValue(ZamEQ2Plugin::paramFreqH, value); } void ZamEQ2UI::imageSliderDragStarted(ImageSlider* slider) { if (slider == fSliderMaster) - d_editParameter(ZamEQ2Plugin::paramMaster, true); + editParameter(ZamEQ2Plugin::paramMaster, true); } void ZamEQ2UI::imageSliderDragFinished(ImageSlider* slider) { if (slider == fSliderMaster) - d_editParameter(ZamEQ2Plugin::paramMaster, false); + editParameter(ZamEQ2Plugin::paramMaster, false); } void ZamEQ2UI::imageSliderValueChanged(ImageSlider* slider, float value) { if (slider == fSliderMaster) - d_setParameterValue(ZamEQ2Plugin::paramMaster, value); + setParameterValue(ZamEQ2Plugin::paramMaster, value); } void ZamEQ2UI::lowshelf(int i, int ch, float srate, float fc, float g) @@ -367,7 +367,7 @@ void ZamEQ2UI::peq(int i, int ch, float srate, float fc, float g, float bw) void ZamEQ2UI::calceqcurve(float x[], float y[]) { - float SR = d_getSampleRate(); + float SR = getSampleRate(); float p1 = 10000.; float p2 = 5000.; float c2 = log10(1.+SR); diff --git a/plugins/ZamEQ2/ZamEQ2UI.hpp b/plugins/ZamEQ2/ZamEQ2UI.hpp index 0b4bb80..53ce272 100644 --- a/plugins/ZamEQ2/ZamEQ2UI.hpp +++ b/plugins/ZamEQ2/ZamEQ2UI.hpp @@ -97,8 +97,8 @@ protected: // ------------------------------------------------------------------- // DSP Callbacks - void d_parameterChanged(uint32_t index, float value) override; - void d_programChanged(uint32_t index) override; + void parameterChanged(uint32_t index, float value) override; + void programLoaded(uint32_t index) override; // ------------------------------------------------------------------- // Widget Callbacks diff --git a/plugins/ZamGEQ31/ZamGEQ31Plugin.cpp b/plugins/ZamGEQ31/ZamGEQ31Plugin.cpp index aac00ea..a674bec 100644 --- a/plugins/ZamGEQ31/ZamGEQ31Plugin.cpp +++ b/plugins/ZamGEQ31/ZamGEQ31Plugin.cpp @@ -25,13 +25,13 @@ ZamGEQ31Plugin::ZamGEQ31Plugin() : Plugin(paramCount, 1, 0) // 1 program, 0 states { // set default values - d_setProgram(0); + loadProgram(0); } // ----------------------------------------------------------------------- // Init -void ZamGEQ31Plugin::d_initParameter(uint32_t index, Parameter& parameter) +void ZamGEQ31Plugin::initParameter(uint32_t index, Parameter& parameter) { switch (index) { @@ -326,7 +326,7 @@ void ZamGEQ31Plugin::d_initParameter(uint32_t index, Parameter& parameter) } } -void ZamGEQ31Plugin::d_initProgramName(uint32_t index, d_string& programName) +void ZamGEQ31Plugin::initProgramName(uint32_t index, String& programName) { if (index != 0) return; @@ -337,7 +337,7 @@ void ZamGEQ31Plugin::d_initProgramName(uint32_t index, d_string& programName) // ----------------------------------------------------------------------- // Internal data -float ZamGEQ31Plugin::d_getParameterValue(uint32_t index) const +float ZamGEQ31Plugin::getParameterValue(uint32_t index) const { switch (index) { @@ -442,7 +442,7 @@ float ZamGEQ31Plugin::d_getParameterValue(uint32_t index) const } } -void ZamGEQ31Plugin::d_setParameterValue(uint32_t index, float value) +void ZamGEQ31Plugin::setParameterValue(uint32_t index, float value) { switch (index) { @@ -590,7 +590,7 @@ double ZamGEQ31Plugin::run_filter(int i, int ch, double in) return out; } -void ZamGEQ31Plugin::d_setProgram(uint32_t index) +void ZamGEQ31Plugin::loadProgram(uint32_t index) { if (index != 0) return; @@ -633,19 +633,19 @@ void ZamGEQ31Plugin::d_setProgram(uint32_t index) freq[29] = 16000.; freq[30] = 20000.; master = 0.f; - float srate = d_getSampleRate(); + float srate = getSampleRate(); for (int i=0; i < MAX_FILT; ++i) { peq(i, srate, freq[i], 0., 1./3.); } /* reset filter values */ - d_activate(); + activate(); } // ----------------------------------------------------------------------- // Process -void ZamGEQ31Plugin::d_activate() +void ZamGEQ31Plugin::activate() { int i; for (i = 0; i < MAX_FILT; ++i) { @@ -682,9 +682,9 @@ double ZamGEQ31Plugin::run_filter(int i, int ch, double in) } */ -void ZamGEQ31Plugin::d_run(const float** inputs, float** outputs, uint32_t frames) +void ZamGEQ31Plugin::run(const float** inputs, float** outputs, uint32_t frames) { - float srate = d_getSampleRate(); + float srate = getSampleRate(); int i; for (i = 0; i < MAX_FILT; i++) { diff --git a/plugins/ZamGEQ31/ZamGEQ31Plugin.hpp b/plugins/ZamGEQ31/ZamGEQ31Plugin.hpp index fae6b8c..2520c9d 100644 --- a/plugins/ZamGEQ31/ZamGEQ31Plugin.hpp +++ b/plugins/ZamGEQ31/ZamGEQ31Plugin.hpp @@ -72,27 +72,27 @@ protected: // ------------------------------------------------------------------- // Information - const char* d_getLabel() const noexcept override + const char* getLabel() const noexcept override { return "ZamGEQ31"; } - const char* d_getMaker() const noexcept override + const char* getMaker() const noexcept override { return "Damien Zammit"; } - const char* d_getLicense() const noexcept override + const char* getLicense() const noexcept override { return "GPL v2+"; } - uint32_t d_getVersion() const noexcept override + uint32_t getVersion() const noexcept override { return 0x1001; } - int64_t d_getUniqueId() const noexcept override + int64_t getUniqueId() const noexcept override { return d_cconst('Z', 'G', '3', '1'); } @@ -100,15 +100,15 @@ protected: // ------------------------------------------------------------------- // Init - void d_initParameter(uint32_t index, Parameter& parameter) ; - void d_initProgramName(uint32_t index, d_string& programName) ; + void initParameter(uint32_t index, Parameter& parameter) ; + void initProgramName(uint32_t index, String& programName) ; // ------------------------------------------------------------------- // Internal data - float d_getParameterValue(uint32_t index) const override; - void d_setParameterValue(uint32_t index, float value) override; - void d_setProgram(uint32_t index) ; + float getParameterValue(uint32_t index) const override; + void setParameterValue(uint32_t index, float value) override; + void loadProgram(uint32_t index) override; // ------------------------------------------------------------------- // Process @@ -135,8 +135,8 @@ protected: return (x >= 0.f ? 1 : -1); } - void d_activate() override; - void d_run(const float** inputs, float** outputs, uint32_t frames) override; + void activate() override; + void run(const float** inputs, float** outputs, uint32_t frames) override; void peq(int i, float srate, float fc, float g, float bw); double run_filter(int i, int ch, double in); diff --git a/plugins/ZamGEQ31/ZamGEQ31UI.cpp b/plugins/ZamGEQ31/ZamGEQ31UI.cpp index 1db4782..f6f1c6d 100644 --- a/plugins/ZamGEQ31/ZamGEQ31UI.cpp +++ b/plugins/ZamGEQ31/ZamGEQ31UI.cpp @@ -390,13 +390,13 @@ ZamGEQ31UI::ZamGEQ31UI() fSliderGain31->setInverted(true); // set default values - d_programChanged(0); + programLoaded(0); } // ----------------------------------------------------------------------- // DSP Callbacks -void ZamGEQ31UI::d_parameterChanged(uint32_t index, float value) +void ZamGEQ31UI::parameterChanged(uint32_t index, float value) { switch (index) { @@ -499,7 +499,7 @@ void ZamGEQ31UI::d_parameterChanged(uint32_t index, float value) } } -void ZamGEQ31UI::d_programChanged(uint32_t index) +void ZamGEQ31UI::programLoaded(uint32_t index) { if (index != 0) return; @@ -546,217 +546,217 @@ void ZamGEQ31UI::d_programChanged(uint32_t index) void ZamGEQ31UI::imageKnobDragStarted(ImageKnob* knob) { if (knob == fKnobMaster) - d_editParameter(ZamGEQ31Plugin::paramMaster, true); + editParameter(ZamGEQ31Plugin::paramMaster, true); } void ZamGEQ31UI::imageKnobDragFinished(ImageKnob* knob) { if (knob == fKnobMaster) - d_editParameter(ZamGEQ31Plugin::paramMaster, false); + editParameter(ZamGEQ31Plugin::paramMaster, false); } void ZamGEQ31UI::imageKnobValueChanged(ImageKnob* knob, float value) { if (knob == fKnobMaster) - d_setParameterValue(ZamGEQ31Plugin::paramMaster, value); + setParameterValue(ZamGEQ31Plugin::paramMaster, value); } void ZamGEQ31UI::imageSliderDragStarted(ImageSlider* slider) { if (slider == fSliderGain1) - d_editParameter(ZamGEQ31Plugin::paramGain1, true); + editParameter(ZamGEQ31Plugin::paramGain1, true); else if (slider == fSliderGain2) - d_editParameter(ZamGEQ31Plugin::paramGain2, true); + editParameter(ZamGEQ31Plugin::paramGain2, true); else if (slider == fSliderGain3) - d_editParameter(ZamGEQ31Plugin::paramGain3, true); + editParameter(ZamGEQ31Plugin::paramGain3, true); else if (slider == fSliderGain4) - d_editParameter(ZamGEQ31Plugin::paramGain4, true); + editParameter(ZamGEQ31Plugin::paramGain4, true); else if (slider == fSliderGain5) - d_editParameter(ZamGEQ31Plugin::paramGain5, true); + editParameter(ZamGEQ31Plugin::paramGain5, true); else if (slider == fSliderGain6) - d_editParameter(ZamGEQ31Plugin::paramGain6, true); + editParameter(ZamGEQ31Plugin::paramGain6, true); else if (slider == fSliderGain7) - d_editParameter(ZamGEQ31Plugin::paramGain7, true); + editParameter(ZamGEQ31Plugin::paramGain7, true); else if (slider == fSliderGain8) - d_editParameter(ZamGEQ31Plugin::paramGain8, true); + editParameter(ZamGEQ31Plugin::paramGain8, true); else if (slider == fSliderGain9) - d_editParameter(ZamGEQ31Plugin::paramGain9, true); + editParameter(ZamGEQ31Plugin::paramGain9, true); else if (slider == fSliderGain10) - d_editParameter(ZamGEQ31Plugin::paramGain10, true); + editParameter(ZamGEQ31Plugin::paramGain10, true); else if (slider == fSliderGain11) - d_editParameter(ZamGEQ31Plugin::paramGain11, true); + editParameter(ZamGEQ31Plugin::paramGain11, true); else if (slider == fSliderGain12) - d_editParameter(ZamGEQ31Plugin::paramGain12, true); + editParameter(ZamGEQ31Plugin::paramGain12, true); else if (slider == fSliderGain13) - d_editParameter(ZamGEQ31Plugin::paramGain13, true); + editParameter(ZamGEQ31Plugin::paramGain13, true); else if (slider == fSliderGain14) - d_editParameter(ZamGEQ31Plugin::paramGain14, true); + editParameter(ZamGEQ31Plugin::paramGain14, true); else if (slider == fSliderGain15) - d_editParameter(ZamGEQ31Plugin::paramGain15, true); + editParameter(ZamGEQ31Plugin::paramGain15, true); else if (slider == fSliderGain16) - d_editParameter(ZamGEQ31Plugin::paramGain16, true); + editParameter(ZamGEQ31Plugin::paramGain16, true); else if (slider == fSliderGain17) - d_editParameter(ZamGEQ31Plugin::paramGain17, true); + editParameter(ZamGEQ31Plugin::paramGain17, true); else if (slider == fSliderGain18) - d_editParameter(ZamGEQ31Plugin::paramGain18, true); + editParameter(ZamGEQ31Plugin::paramGain18, true); else if (slider == fSliderGain19) - d_editParameter(ZamGEQ31Plugin::paramGain19, true); + editParameter(ZamGEQ31Plugin::paramGain19, true); else if (slider == fSliderGain20) - d_editParameter(ZamGEQ31Plugin::paramGain20, true); + editParameter(ZamGEQ31Plugin::paramGain20, true); else if (slider == fSliderGain21) - d_editParameter(ZamGEQ31Plugin::paramGain21, true); + editParameter(ZamGEQ31Plugin::paramGain21, true); else if (slider == fSliderGain22) - d_editParameter(ZamGEQ31Plugin::paramGain22, true); + editParameter(ZamGEQ31Plugin::paramGain22, true); else if (slider == fSliderGain23) - d_editParameter(ZamGEQ31Plugin::paramGain23, true); + editParameter(ZamGEQ31Plugin::paramGain23, true); else if (slider == fSliderGain24) - d_editParameter(ZamGEQ31Plugin::paramGain24, true); + editParameter(ZamGEQ31Plugin::paramGain24, true); else if (slider == fSliderGain25) - d_editParameter(ZamGEQ31Plugin::paramGain25, true); + editParameter(ZamGEQ31Plugin::paramGain25, true); else if (slider == fSliderGain26) - d_editParameter(ZamGEQ31Plugin::paramGain26, true); + editParameter(ZamGEQ31Plugin::paramGain26, true); else if (slider == fSliderGain27) - d_editParameter(ZamGEQ31Plugin::paramGain27, true); + editParameter(ZamGEQ31Plugin::paramGain27, true); else if (slider == fSliderGain28) - d_editParameter(ZamGEQ31Plugin::paramGain28, true); + editParameter(ZamGEQ31Plugin::paramGain28, true); else if (slider == fSliderGain29) - d_editParameter(ZamGEQ31Plugin::paramGain29, true); + editParameter(ZamGEQ31Plugin::paramGain29, true); else if (slider == fSliderGain30) - d_editParameter(ZamGEQ31Plugin::paramGain30, true); + editParameter(ZamGEQ31Plugin::paramGain30, true); else if (slider == fSliderGain31) - d_editParameter(ZamGEQ31Plugin::paramGain31, true); + editParameter(ZamGEQ31Plugin::paramGain31, true); } void ZamGEQ31UI::imageSliderDragFinished(ImageSlider* slider) { if (slider == fSliderGain1) - d_editParameter(ZamGEQ31Plugin::paramGain1, false); + editParameter(ZamGEQ31Plugin::paramGain1, false); else if (slider == fSliderGain2) - d_editParameter(ZamGEQ31Plugin::paramGain2, false); + editParameter(ZamGEQ31Plugin::paramGain2, false); else if (slider == fSliderGain3) - d_editParameter(ZamGEQ31Plugin::paramGain3, false); + editParameter(ZamGEQ31Plugin::paramGain3, false); else if (slider == fSliderGain4) - d_editParameter(ZamGEQ31Plugin::paramGain4, false); + editParameter(ZamGEQ31Plugin::paramGain4, false); else if (slider == fSliderGain5) - d_editParameter(ZamGEQ31Plugin::paramGain5, false); + editParameter(ZamGEQ31Plugin::paramGain5, false); else if (slider == fSliderGain6) - d_editParameter(ZamGEQ31Plugin::paramGain6, false); + editParameter(ZamGEQ31Plugin::paramGain6, false); else if (slider == fSliderGain7) - d_editParameter(ZamGEQ31Plugin::paramGain7, false); + editParameter(ZamGEQ31Plugin::paramGain7, false); else if (slider == fSliderGain8) - d_editParameter(ZamGEQ31Plugin::paramGain8, false); + editParameter(ZamGEQ31Plugin::paramGain8, false); else if (slider == fSliderGain9) - d_editParameter(ZamGEQ31Plugin::paramGain9, false); + editParameter(ZamGEQ31Plugin::paramGain9, false); else if (slider == fSliderGain10) - d_editParameter(ZamGEQ31Plugin::paramGain10, false); + editParameter(ZamGEQ31Plugin::paramGain10, false); else if (slider == fSliderGain11) - d_editParameter(ZamGEQ31Plugin::paramGain11, false); + editParameter(ZamGEQ31Plugin::paramGain11, false); else if (slider == fSliderGain12) - d_editParameter(ZamGEQ31Plugin::paramGain12, false); + editParameter(ZamGEQ31Plugin::paramGain12, false); else if (slider == fSliderGain13) - d_editParameter(ZamGEQ31Plugin::paramGain13, false); + editParameter(ZamGEQ31Plugin::paramGain13, false); else if (slider == fSliderGain14) - d_editParameter(ZamGEQ31Plugin::paramGain14, false); + editParameter(ZamGEQ31Plugin::paramGain14, false); else if (slider == fSliderGain15) - d_editParameter(ZamGEQ31Plugin::paramGain15, false); + editParameter(ZamGEQ31Plugin::paramGain15, false); else if (slider == fSliderGain16) - d_editParameter(ZamGEQ31Plugin::paramGain16, false); + editParameter(ZamGEQ31Plugin::paramGain16, false); else if (slider == fSliderGain17) - d_editParameter(ZamGEQ31Plugin::paramGain17, false); + editParameter(ZamGEQ31Plugin::paramGain17, false); else if (slider == fSliderGain18) - d_editParameter(ZamGEQ31Plugin::paramGain18, false); + editParameter(ZamGEQ31Plugin::paramGain18, false); else if (slider == fSliderGain19) - d_editParameter(ZamGEQ31Plugin::paramGain19, false); + editParameter(ZamGEQ31Plugin::paramGain19, false); else if (slider == fSliderGain20) - d_editParameter(ZamGEQ31Plugin::paramGain20, false); + editParameter(ZamGEQ31Plugin::paramGain20, false); else if (slider == fSliderGain21) - d_editParameter(ZamGEQ31Plugin::paramGain21, false); + editParameter(ZamGEQ31Plugin::paramGain21, false); else if (slider == fSliderGain22) - d_editParameter(ZamGEQ31Plugin::paramGain22, false); + editParameter(ZamGEQ31Plugin::paramGain22, false); else if (slider == fSliderGain23) - d_editParameter(ZamGEQ31Plugin::paramGain23, false); + editParameter(ZamGEQ31Plugin::paramGain23, false); else if (slider == fSliderGain24) - d_editParameter(ZamGEQ31Plugin::paramGain24, false); + editParameter(ZamGEQ31Plugin::paramGain24, false); else if (slider == fSliderGain25) - d_editParameter(ZamGEQ31Plugin::paramGain25, false); + editParameter(ZamGEQ31Plugin::paramGain25, false); else if (slider == fSliderGain26) - d_editParameter(ZamGEQ31Plugin::paramGain26, false); + editParameter(ZamGEQ31Plugin::paramGain26, false); else if (slider == fSliderGain27) - d_editParameter(ZamGEQ31Plugin::paramGain27, false); + editParameter(ZamGEQ31Plugin::paramGain27, false); else if (slider == fSliderGain28) - d_editParameter(ZamGEQ31Plugin::paramGain28, false); + editParameter(ZamGEQ31Plugin::paramGain28, false); else if (slider == fSliderGain29) - d_editParameter(ZamGEQ31Plugin::paramGain29, false); + editParameter(ZamGEQ31Plugin::paramGain29, false); else if (slider == fSliderGain30) - d_editParameter(ZamGEQ31Plugin::paramGain30, false); + editParameter(ZamGEQ31Plugin::paramGain30, false); else if (slider == fSliderGain31) - d_editParameter(ZamGEQ31Plugin::paramGain31, false); + editParameter(ZamGEQ31Plugin::paramGain31, false); } void ZamGEQ31UI::imageSliderValueChanged(ImageSlider* slider, float value) { if (slider == fSliderGain1) - d_setParameterValue(ZamGEQ31Plugin::paramGain1, value); + setParameterValue(ZamGEQ31Plugin::paramGain1, value); else if (slider == fSliderGain2) - d_setParameterValue(ZamGEQ31Plugin::paramGain2, value); + setParameterValue(ZamGEQ31Plugin::paramGain2, value); else if (slider == fSliderGain3) - d_setParameterValue(ZamGEQ31Plugin::paramGain3, value); + setParameterValue(ZamGEQ31Plugin::paramGain3, value); else if (slider == fSliderGain4) - d_setParameterValue(ZamGEQ31Plugin::paramGain4, value); + setParameterValue(ZamGEQ31Plugin::paramGain4, value); else if (slider == fSliderGain5) - d_setParameterValue(ZamGEQ31Plugin::paramGain5, value); + setParameterValue(ZamGEQ31Plugin::paramGain5, value); else if (slider == fSliderGain6) - d_setParameterValue(ZamGEQ31Plugin::paramGain6, value); + setParameterValue(ZamGEQ31Plugin::paramGain6, value); else if (slider == fSliderGain7) - d_setParameterValue(ZamGEQ31Plugin::paramGain7, value); + setParameterValue(ZamGEQ31Plugin::paramGain7, value); else if (slider == fSliderGain8) - d_setParameterValue(ZamGEQ31Plugin::paramGain8, value); + setParameterValue(ZamGEQ31Plugin::paramGain8, value); else if (slider == fSliderGain9) - d_setParameterValue(ZamGEQ31Plugin::paramGain9, value); + setParameterValue(ZamGEQ31Plugin::paramGain9, value); else if (slider == fSliderGain10) - d_setParameterValue(ZamGEQ31Plugin::paramGain10, value); + setParameterValue(ZamGEQ31Plugin::paramGain10, value); else if (slider == fSliderGain11) - d_setParameterValue(ZamGEQ31Plugin::paramGain11, value); + setParameterValue(ZamGEQ31Plugin::paramGain11, value); else if (slider == fSliderGain12) - d_setParameterValue(ZamGEQ31Plugin::paramGain12, value); + setParameterValue(ZamGEQ31Plugin::paramGain12, value); else if (slider == fSliderGain13) - d_setParameterValue(ZamGEQ31Plugin::paramGain13, value); + setParameterValue(ZamGEQ31Plugin::paramGain13, value); else if (slider == fSliderGain14) - d_setParameterValue(ZamGEQ31Plugin::paramGain14, value); + setParameterValue(ZamGEQ31Plugin::paramGain14, value); else if (slider == fSliderGain15) - d_setParameterValue(ZamGEQ31Plugin::paramGain15, value); + setParameterValue(ZamGEQ31Plugin::paramGain15, value); else if (slider == fSliderGain16) - d_setParameterValue(ZamGEQ31Plugin::paramGain16, value); + setParameterValue(ZamGEQ31Plugin::paramGain16, value); else if (slider == fSliderGain17) - d_setParameterValue(ZamGEQ31Plugin::paramGain17, value); + setParameterValue(ZamGEQ31Plugin::paramGain17, value); else if (slider == fSliderGain18) - d_setParameterValue(ZamGEQ31Plugin::paramGain18, value); + setParameterValue(ZamGEQ31Plugin::paramGain18, value); else if (slider == fSliderGain19) - d_setParameterValue(ZamGEQ31Plugin::paramGain19, value); + setParameterValue(ZamGEQ31Plugin::paramGain19, value); else if (slider == fSliderGain20) - d_setParameterValue(ZamGEQ31Plugin::paramGain20, value); + setParameterValue(ZamGEQ31Plugin::paramGain20, value); else if (slider == fSliderGain21) - d_setParameterValue(ZamGEQ31Plugin::paramGain21, value); + setParameterValue(ZamGEQ31Plugin::paramGain21, value); else if (slider == fSliderGain22) - d_setParameterValue(ZamGEQ31Plugin::paramGain22, value); + setParameterValue(ZamGEQ31Plugin::paramGain22, value); else if (slider == fSliderGain23) - d_setParameterValue(ZamGEQ31Plugin::paramGain23, value); + setParameterValue(ZamGEQ31Plugin::paramGain23, value); else if (slider == fSliderGain24) - d_setParameterValue(ZamGEQ31Plugin::paramGain24, value); + setParameterValue(ZamGEQ31Plugin::paramGain24, value); else if (slider == fSliderGain25) - d_setParameterValue(ZamGEQ31Plugin::paramGain25, value); + setParameterValue(ZamGEQ31Plugin::paramGain25, value); else if (slider == fSliderGain26) - d_setParameterValue(ZamGEQ31Plugin::paramGain26, value); + setParameterValue(ZamGEQ31Plugin::paramGain26, value); else if (slider == fSliderGain27) - d_setParameterValue(ZamGEQ31Plugin::paramGain27, value); + setParameterValue(ZamGEQ31Plugin::paramGain27, value); else if (slider == fSliderGain28) - d_setParameterValue(ZamGEQ31Plugin::paramGain28, value); + setParameterValue(ZamGEQ31Plugin::paramGain28, value); else if (slider == fSliderGain29) - d_setParameterValue(ZamGEQ31Plugin::paramGain29, value); + setParameterValue(ZamGEQ31Plugin::paramGain29, value); else if (slider == fSliderGain30) - d_setParameterValue(ZamGEQ31Plugin::paramGain30, value); + setParameterValue(ZamGEQ31Plugin::paramGain30, value); else if (slider == fSliderGain31) - d_setParameterValue(ZamGEQ31Plugin::paramGain31, value); + setParameterValue(ZamGEQ31Plugin::paramGain31, value); } void ZamGEQ31UI::onDisplay() diff --git a/plugins/ZamGEQ31/ZamGEQ31UI.hpp b/plugins/ZamGEQ31/ZamGEQ31UI.hpp index 2e7ff98..806d9e6 100644 --- a/plugins/ZamGEQ31/ZamGEQ31UI.hpp +++ b/plugins/ZamGEQ31/ZamGEQ31UI.hpp @@ -57,8 +57,8 @@ protected: // ------------------------------------------------------------------- // DSP Callbacks - void d_parameterChanged(uint32_t index, float value) override; - void d_programChanged(uint32_t index) override; + void parameterChanged(uint32_t index, float value) override; + void programLoaded(uint32_t index) override; // ------------------------------------------------------------------- // Widget Callbacks diff --git a/plugins/ZamGEQ31X2/ZamGEQ31X2Plugin.cpp b/plugins/ZamGEQ31X2/ZamGEQ31X2Plugin.cpp index 96e3de3..3647874 100644 --- a/plugins/ZamGEQ31X2/ZamGEQ31X2Plugin.cpp +++ b/plugins/ZamGEQ31X2/ZamGEQ31X2Plugin.cpp @@ -25,13 +25,13 @@ ZamGEQ31X2Plugin::ZamGEQ31X2Plugin() : Plugin(paramCount, 1, 0) // 1 program, 0 states { // set default values - d_setProgram(0); + loadProgram(0); } // ----------------------------------------------------------------------- // Init -void ZamGEQ31X2Plugin::d_initParameter(uint32_t index, Parameter& parameter) +void ZamGEQ31X2Plugin::initParameter(uint32_t index, Parameter& parameter) { switch (index) { @@ -614,7 +614,7 @@ void ZamGEQ31X2Plugin::d_initParameter(uint32_t index, Parameter& parameter) } } -void ZamGEQ31X2Plugin::d_initProgramName(uint32_t index, d_string& programName) +void ZamGEQ31X2Plugin::initProgramName(uint32_t index, String& programName) { if (index != 0) return; @@ -625,7 +625,7 @@ void ZamGEQ31X2Plugin::d_initProgramName(uint32_t index, d_string& programName) // ----------------------------------------------------------------------- // Internal data -float ZamGEQ31X2Plugin::d_getParameterValue(uint32_t index) const +float ZamGEQ31X2Plugin::getParameterValue(uint32_t index) const { switch (index) { @@ -826,7 +826,7 @@ float ZamGEQ31X2Plugin::d_getParameterValue(uint32_t index) const } } -void ZamGEQ31X2Plugin::d_setParameterValue(uint32_t index, float value) +void ZamGEQ31X2Plugin::setParameterValue(uint32_t index, float value) { switch (index) { @@ -1070,7 +1070,7 @@ double ZamGEQ31X2Plugin::run_filter(int i, int ch, double in) return out; } -void ZamGEQ31X2Plugin::d_setProgram(uint32_t index) +void ZamGEQ31X2Plugin::loadProgram(uint32_t index) { if (index != 0) return; @@ -1115,20 +1115,20 @@ void ZamGEQ31X2Plugin::d_setProgram(uint32_t index) freq[30] = 20000.; master = 0.f; link = 0; - float srate = d_getSampleRate(); + float srate = getSampleRate(); for (int i=0; i < MAX_FILT; ++i) { peq(i, 0, srate, freq[i], 0., 1./3.); peq(i, 1, srate, freq[i], 0., 1./3.); } /* reset filter values */ - d_activate(); + activate(); } // ----------------------------------------------------------------------- // Process -void ZamGEQ31X2Plugin::d_activate() +void ZamGEQ31X2Plugin::activate() { int i; for (i = 0; i < MAX_FILT; ++i) { @@ -1169,9 +1169,9 @@ double ZamGEQ31X2Plugin::run_filter(int i, int ch, double in) } */ -void ZamGEQ31X2Plugin::d_run(const float** inputs, float** outputs, uint32_t frames) +void ZamGEQ31X2Plugin::run(const float** inputs, float** outputs, uint32_t frames) { - float srate = d_getSampleRate(); + float srate = getSampleRate(); int i; for (i = 0; i < MAX_FILT; i++) { diff --git a/plugins/ZamGEQ31X2/ZamGEQ31X2Plugin.hpp b/plugins/ZamGEQ31X2/ZamGEQ31X2Plugin.hpp index 96d3309..da3044b 100644 --- a/plugins/ZamGEQ31X2/ZamGEQ31X2Plugin.hpp +++ b/plugins/ZamGEQ31X2/ZamGEQ31X2Plugin.hpp @@ -104,27 +104,27 @@ protected: // ------------------------------------------------------------------- // Information - const char* d_getLabel() const noexcept override + const char* getLabel() const noexcept override { return "ZamGEQ31X2"; } - const char* d_getMaker() const noexcept override + const char* getMaker() const noexcept override { return "Damien Zammit"; } - const char* d_getLicense() const noexcept override + const char* getLicense() const noexcept override { return "GPL v2+"; } - uint32_t d_getVersion() const noexcept override + uint32_t getVersion() const noexcept override { return 0x1001; } - int64_t d_getUniqueId() const noexcept override + int64_t getUniqueId() const noexcept override { return d_cconst('Z', 'G', '3', '2'); } @@ -132,15 +132,15 @@ protected: // ------------------------------------------------------------------- // Init - void d_initParameter(uint32_t index, Parameter& parameter) ; - void d_initProgramName(uint32_t index, d_string& programName) ; + void initParameter(uint32_t index, Parameter& parameter) ; + void initProgramName(uint32_t index, String& programName) ; // ------------------------------------------------------------------- // Internal data - float d_getParameterValue(uint32_t index) const override; - void d_setParameterValue(uint32_t index, float value) override; - void d_setProgram(uint32_t index) ; + float getParameterValue(uint32_t index) const override; + void setParameterValue(uint32_t index, float value) override; + void loadProgram(uint32_t index) override; // ------------------------------------------------------------------- // Process @@ -167,8 +167,8 @@ protected: return (x >= 0.f ? 1 : -1); } - void d_activate() override; - void d_run(const float** inputs, float** outputs, uint32_t frames) override; + void activate() override; + void run(const float** inputs, float** outputs, uint32_t frames) override; void peq(int i, int ch, float srate, float fc, float g, float bw); double run_filter(int i, int ch, double in); diff --git a/plugins/ZamGEQ31X2/ZamGEQ31X2UI.cpp b/plugins/ZamGEQ31X2/ZamGEQ31X2UI.cpp index bff3a57..d4ae51a 100644 --- a/plugins/ZamGEQ31X2/ZamGEQ31X2UI.cpp +++ b/plugins/ZamGEQ31X2/ZamGEQ31X2UI.cpp @@ -740,13 +740,13 @@ ZamGEQ31X2UI::ZamGEQ31X2UI() fSliderGain31R->setInverted(true); // set default values - d_programChanged(0); + programLoaded(0); } // ----------------------------------------------------------------------- // DSP Callbacks -void ZamGEQ31X2UI::d_parameterChanged(uint32_t index, float value) +void ZamGEQ31X2UI::parameterChanged(uint32_t index, float value) { switch (index) { @@ -942,7 +942,7 @@ void ZamGEQ31X2UI::d_parameterChanged(uint32_t index, float value) } } -void ZamGEQ31X2UI::d_programChanged(uint32_t index) +void ZamGEQ31X2UI::programLoaded(uint32_t index) { if (index != 0) return; @@ -1020,391 +1020,391 @@ void ZamGEQ31X2UI::d_programChanged(uint32_t index) void ZamGEQ31X2UI::imageSliderDragStarted(ImageSlider* slider) { if (slider == fSliderMaster) - d_editParameter(ZamGEQ31X2Plugin::paramMaster, true); + editParameter(ZamGEQ31X2Plugin::paramMaster, true); else if (slider == fSliderGain1L) - d_editParameter(ZamGEQ31X2Plugin::paramGain1L, true); + editParameter(ZamGEQ31X2Plugin::paramGain1L, true); else if (slider == fSliderGain2L) - d_editParameter(ZamGEQ31X2Plugin::paramGain2L, true); + editParameter(ZamGEQ31X2Plugin::paramGain2L, true); else if (slider == fSliderGain3L) - d_editParameter(ZamGEQ31X2Plugin::paramGain3L, true); + editParameter(ZamGEQ31X2Plugin::paramGain3L, true); else if (slider == fSliderGain4L) - d_editParameter(ZamGEQ31X2Plugin::paramGain4L, true); + editParameter(ZamGEQ31X2Plugin::paramGain4L, true); else if (slider == fSliderGain5L) - d_editParameter(ZamGEQ31X2Plugin::paramGain5L, true); + editParameter(ZamGEQ31X2Plugin::paramGain5L, true); else if (slider == fSliderGain6L) - d_editParameter(ZamGEQ31X2Plugin::paramGain6L, true); + editParameter(ZamGEQ31X2Plugin::paramGain6L, true); else if (slider == fSliderGain7L) - d_editParameter(ZamGEQ31X2Plugin::paramGain7L, true); + editParameter(ZamGEQ31X2Plugin::paramGain7L, true); else if (slider == fSliderGain8L) - d_editParameter(ZamGEQ31X2Plugin::paramGain8L, true); + editParameter(ZamGEQ31X2Plugin::paramGain8L, true); else if (slider == fSliderGain9L) - d_editParameter(ZamGEQ31X2Plugin::paramGain9L, true); + editParameter(ZamGEQ31X2Plugin::paramGain9L, true); else if (slider == fSliderGain10L) - d_editParameter(ZamGEQ31X2Plugin::paramGain10L, true); + editParameter(ZamGEQ31X2Plugin::paramGain10L, true); else if (slider == fSliderGain11L) - d_editParameter(ZamGEQ31X2Plugin::paramGain11L, true); + editParameter(ZamGEQ31X2Plugin::paramGain11L, true); else if (slider == fSliderGain12L) - d_editParameter(ZamGEQ31X2Plugin::paramGain12L, true); + editParameter(ZamGEQ31X2Plugin::paramGain12L, true); else if (slider == fSliderGain13L) - d_editParameter(ZamGEQ31X2Plugin::paramGain13L, true); + editParameter(ZamGEQ31X2Plugin::paramGain13L, true); else if (slider == fSliderGain14L) - d_editParameter(ZamGEQ31X2Plugin::paramGain14L, true); + editParameter(ZamGEQ31X2Plugin::paramGain14L, true); else if (slider == fSliderGain15L) - d_editParameter(ZamGEQ31X2Plugin::paramGain15L, true); + editParameter(ZamGEQ31X2Plugin::paramGain15L, true); else if (slider == fSliderGain16L) - d_editParameter(ZamGEQ31X2Plugin::paramGain16L, true); + editParameter(ZamGEQ31X2Plugin::paramGain16L, true); else if (slider == fSliderGain17L) - d_editParameter(ZamGEQ31X2Plugin::paramGain17L, true); + editParameter(ZamGEQ31X2Plugin::paramGain17L, true); else if (slider == fSliderGain18L) - d_editParameter(ZamGEQ31X2Plugin::paramGain18L, true); + editParameter(ZamGEQ31X2Plugin::paramGain18L, true); else if (slider == fSliderGain19L) - d_editParameter(ZamGEQ31X2Plugin::paramGain19L, true); + editParameter(ZamGEQ31X2Plugin::paramGain19L, true); else if (slider == fSliderGain20L) - d_editParameter(ZamGEQ31X2Plugin::paramGain20L, true); + editParameter(ZamGEQ31X2Plugin::paramGain20L, true); else if (slider == fSliderGain21L) - d_editParameter(ZamGEQ31X2Plugin::paramGain21L, true); + editParameter(ZamGEQ31X2Plugin::paramGain21L, true); else if (slider == fSliderGain22L) - d_editParameter(ZamGEQ31X2Plugin::paramGain22L, true); + editParameter(ZamGEQ31X2Plugin::paramGain22L, true); else if (slider == fSliderGain23L) - d_editParameter(ZamGEQ31X2Plugin::paramGain23L, true); + editParameter(ZamGEQ31X2Plugin::paramGain23L, true); else if (slider == fSliderGain24L) - d_editParameter(ZamGEQ31X2Plugin::paramGain24L, true); + editParameter(ZamGEQ31X2Plugin::paramGain24L, true); else if (slider == fSliderGain25L) - d_editParameter(ZamGEQ31X2Plugin::paramGain25L, true); + editParameter(ZamGEQ31X2Plugin::paramGain25L, true); else if (slider == fSliderGain26L) - d_editParameter(ZamGEQ31X2Plugin::paramGain26L, true); + editParameter(ZamGEQ31X2Plugin::paramGain26L, true); else if (slider == fSliderGain27L) - d_editParameter(ZamGEQ31X2Plugin::paramGain27L, true); + editParameter(ZamGEQ31X2Plugin::paramGain27L, true); else if (slider == fSliderGain28L) - d_editParameter(ZamGEQ31X2Plugin::paramGain28L, true); + editParameter(ZamGEQ31X2Plugin::paramGain28L, true); else if (slider == fSliderGain29L) - d_editParameter(ZamGEQ31X2Plugin::paramGain29L, true); + editParameter(ZamGEQ31X2Plugin::paramGain29L, true); else if (slider == fSliderGain30L) - d_editParameter(ZamGEQ31X2Plugin::paramGain30L, true); + editParameter(ZamGEQ31X2Plugin::paramGain30L, true); else if (slider == fSliderGain31L) - d_editParameter(ZamGEQ31X2Plugin::paramGain31L, true); + editParameter(ZamGEQ31X2Plugin::paramGain31L, true); else if (slider == fSliderGain1R) - d_editParameter(ZamGEQ31X2Plugin::paramGain1R, true); + editParameter(ZamGEQ31X2Plugin::paramGain1R, true); else if (slider == fSliderGain2R) - d_editParameter(ZamGEQ31X2Plugin::paramGain2R, true); + editParameter(ZamGEQ31X2Plugin::paramGain2R, true); else if (slider == fSliderGain3R) - d_editParameter(ZamGEQ31X2Plugin::paramGain3R, true); + editParameter(ZamGEQ31X2Plugin::paramGain3R, true); else if (slider == fSliderGain4R) - d_editParameter(ZamGEQ31X2Plugin::paramGain4R, true); + editParameter(ZamGEQ31X2Plugin::paramGain4R, true); else if (slider == fSliderGain5R) - d_editParameter(ZamGEQ31X2Plugin::paramGain5R, true); + editParameter(ZamGEQ31X2Plugin::paramGain5R, true); else if (slider == fSliderGain6R) - d_editParameter(ZamGEQ31X2Plugin::paramGain6R, true); + editParameter(ZamGEQ31X2Plugin::paramGain6R, true); else if (slider == fSliderGain7R) - d_editParameter(ZamGEQ31X2Plugin::paramGain7R, true); + editParameter(ZamGEQ31X2Plugin::paramGain7R, true); else if (slider == fSliderGain8R) - d_editParameter(ZamGEQ31X2Plugin::paramGain8R, true); + editParameter(ZamGEQ31X2Plugin::paramGain8R, true); else if (slider == fSliderGain9R) - d_editParameter(ZamGEQ31X2Plugin::paramGain9R, true); + editParameter(ZamGEQ31X2Plugin::paramGain9R, true); else if (slider == fSliderGain10R) - d_editParameter(ZamGEQ31X2Plugin::paramGain10R, true); + editParameter(ZamGEQ31X2Plugin::paramGain10R, true); else if (slider == fSliderGain11R) - d_editParameter(ZamGEQ31X2Plugin::paramGain11R, true); + editParameter(ZamGEQ31X2Plugin::paramGain11R, true); else if (slider == fSliderGain12R) - d_editParameter(ZamGEQ31X2Plugin::paramGain12R, true); + editParameter(ZamGEQ31X2Plugin::paramGain12R, true); else if (slider == fSliderGain13R) - d_editParameter(ZamGEQ31X2Plugin::paramGain13R, true); + editParameter(ZamGEQ31X2Plugin::paramGain13R, true); else if (slider == fSliderGain14R) - d_editParameter(ZamGEQ31X2Plugin::paramGain14R, true); + editParameter(ZamGEQ31X2Plugin::paramGain14R, true); else if (slider == fSliderGain15R) - d_editParameter(ZamGEQ31X2Plugin::paramGain15R, true); + editParameter(ZamGEQ31X2Plugin::paramGain15R, true); else if (slider == fSliderGain16R) - d_editParameter(ZamGEQ31X2Plugin::paramGain16R, true); + editParameter(ZamGEQ31X2Plugin::paramGain16R, true); else if (slider == fSliderGain17R) - d_editParameter(ZamGEQ31X2Plugin::paramGain17R, true); + editParameter(ZamGEQ31X2Plugin::paramGain17R, true); else if (slider == fSliderGain18R) - d_editParameter(ZamGEQ31X2Plugin::paramGain18R, true); + editParameter(ZamGEQ31X2Plugin::paramGain18R, true); else if (slider == fSliderGain19R) - d_editParameter(ZamGEQ31X2Plugin::paramGain19R, true); + editParameter(ZamGEQ31X2Plugin::paramGain19R, true); else if (slider == fSliderGain20R) - d_editParameter(ZamGEQ31X2Plugin::paramGain20R, true); + editParameter(ZamGEQ31X2Plugin::paramGain20R, true); else if (slider == fSliderGain21R) - d_editParameter(ZamGEQ31X2Plugin::paramGain21R, true); + editParameter(ZamGEQ31X2Plugin::paramGain21R, true); else if (slider == fSliderGain22R) - d_editParameter(ZamGEQ31X2Plugin::paramGain22R, true); + editParameter(ZamGEQ31X2Plugin::paramGain22R, true); else if (slider == fSliderGain23R) - d_editParameter(ZamGEQ31X2Plugin::paramGain23R, true); + editParameter(ZamGEQ31X2Plugin::paramGain23R, true); else if (slider == fSliderGain24R) - d_editParameter(ZamGEQ31X2Plugin::paramGain24R, true); + editParameter(ZamGEQ31X2Plugin::paramGain24R, true); else if (slider == fSliderGain25R) - d_editParameter(ZamGEQ31X2Plugin::paramGain25R, true); + editParameter(ZamGEQ31X2Plugin::paramGain25R, true); else if (slider == fSliderGain26R) - d_editParameter(ZamGEQ31X2Plugin::paramGain26R, true); + editParameter(ZamGEQ31X2Plugin::paramGain26R, true); else if (slider == fSliderGain27R) - d_editParameter(ZamGEQ31X2Plugin::paramGain27R, true); + editParameter(ZamGEQ31X2Plugin::paramGain27R, true); else if (slider == fSliderGain28R) - d_editParameter(ZamGEQ31X2Plugin::paramGain28R, true); + editParameter(ZamGEQ31X2Plugin::paramGain28R, true); else if (slider == fSliderGain29R) - d_editParameter(ZamGEQ31X2Plugin::paramGain29R, true); + editParameter(ZamGEQ31X2Plugin::paramGain29R, true); else if (slider == fSliderGain30R) - d_editParameter(ZamGEQ31X2Plugin::paramGain30R, true); + editParameter(ZamGEQ31X2Plugin::paramGain30R, true); else if (slider == fSliderGain31R) - d_editParameter(ZamGEQ31X2Plugin::paramGain31R, true); + editParameter(ZamGEQ31X2Plugin::paramGain31R, true); } void ZamGEQ31X2UI::imageSliderDragFinished(ImageSlider* slider) { if (slider == fSliderMaster) - d_editParameter(ZamGEQ31X2Plugin::paramMaster, false); + editParameter(ZamGEQ31X2Plugin::paramMaster, false); else if (slider == fSliderGain1L) - d_editParameter(ZamGEQ31X2Plugin::paramGain1L, false); + editParameter(ZamGEQ31X2Plugin::paramGain1L, false); else if (slider == fSliderGain2L) - d_editParameter(ZamGEQ31X2Plugin::paramGain2L, false); + editParameter(ZamGEQ31X2Plugin::paramGain2L, false); else if (slider == fSliderGain3L) - d_editParameter(ZamGEQ31X2Plugin::paramGain3L, false); + editParameter(ZamGEQ31X2Plugin::paramGain3L, false); else if (slider == fSliderGain4L) - d_editParameter(ZamGEQ31X2Plugin::paramGain4L, false); + editParameter(ZamGEQ31X2Plugin::paramGain4L, false); else if (slider == fSliderGain5L) - d_editParameter(ZamGEQ31X2Plugin::paramGain5L, false); + editParameter(ZamGEQ31X2Plugin::paramGain5L, false); else if (slider == fSliderGain6L) - d_editParameter(ZamGEQ31X2Plugin::paramGain6L, false); + editParameter(ZamGEQ31X2Plugin::paramGain6L, false); else if (slider == fSliderGain7L) - d_editParameter(ZamGEQ31X2Plugin::paramGain7L, false); + editParameter(ZamGEQ31X2Plugin::paramGain7L, false); else if (slider == fSliderGain8L) - d_editParameter(ZamGEQ31X2Plugin::paramGain8L, false); + editParameter(ZamGEQ31X2Plugin::paramGain8L, false); else if (slider == fSliderGain9L) - d_editParameter(ZamGEQ31X2Plugin::paramGain9L, false); + editParameter(ZamGEQ31X2Plugin::paramGain9L, false); else if (slider == fSliderGain10L) - d_editParameter(ZamGEQ31X2Plugin::paramGain10L, false); + editParameter(ZamGEQ31X2Plugin::paramGain10L, false); else if (slider == fSliderGain11L) - d_editParameter(ZamGEQ31X2Plugin::paramGain11L, false); + editParameter(ZamGEQ31X2Plugin::paramGain11L, false); else if (slider == fSliderGain12L) - d_editParameter(ZamGEQ31X2Plugin::paramGain12L, false); + editParameter(ZamGEQ31X2Plugin::paramGain12L, false); else if (slider == fSliderGain13L) - d_editParameter(ZamGEQ31X2Plugin::paramGain13L, false); + editParameter(ZamGEQ31X2Plugin::paramGain13L, false); else if (slider == fSliderGain14L) - d_editParameter(ZamGEQ31X2Plugin::paramGain14L, false); + editParameter(ZamGEQ31X2Plugin::paramGain14L, false); else if (slider == fSliderGain15L) - d_editParameter(ZamGEQ31X2Plugin::paramGain15L, false); + editParameter(ZamGEQ31X2Plugin::paramGain15L, false); else if (slider == fSliderGain16L) - d_editParameter(ZamGEQ31X2Plugin::paramGain16L, false); + editParameter(ZamGEQ31X2Plugin::paramGain16L, false); else if (slider == fSliderGain17L) - d_editParameter(ZamGEQ31X2Plugin::paramGain17L, false); + editParameter(ZamGEQ31X2Plugin::paramGain17L, false); else if (slider == fSliderGain18L) - d_editParameter(ZamGEQ31X2Plugin::paramGain18L, false); + editParameter(ZamGEQ31X2Plugin::paramGain18L, false); else if (slider == fSliderGain19L) - d_editParameter(ZamGEQ31X2Plugin::paramGain19L, false); + editParameter(ZamGEQ31X2Plugin::paramGain19L, false); else if (slider == fSliderGain20L) - d_editParameter(ZamGEQ31X2Plugin::paramGain20L, false); + editParameter(ZamGEQ31X2Plugin::paramGain20L, false); else if (slider == fSliderGain21L) - d_editParameter(ZamGEQ31X2Plugin::paramGain21L, false); + editParameter(ZamGEQ31X2Plugin::paramGain21L, false); else if (slider == fSliderGain22L) - d_editParameter(ZamGEQ31X2Plugin::paramGain22L, false); + editParameter(ZamGEQ31X2Plugin::paramGain22L, false); else if (slider == fSliderGain23L) - d_editParameter(ZamGEQ31X2Plugin::paramGain23L, false); + editParameter(ZamGEQ31X2Plugin::paramGain23L, false); else if (slider == fSliderGain24L) - d_editParameter(ZamGEQ31X2Plugin::paramGain24L, false); + editParameter(ZamGEQ31X2Plugin::paramGain24L, false); else if (slider == fSliderGain25L) - d_editParameter(ZamGEQ31X2Plugin::paramGain25L, false); + editParameter(ZamGEQ31X2Plugin::paramGain25L, false); else if (slider == fSliderGain26L) - d_editParameter(ZamGEQ31X2Plugin::paramGain26L, false); + editParameter(ZamGEQ31X2Plugin::paramGain26L, false); else if (slider == fSliderGain27L) - d_editParameter(ZamGEQ31X2Plugin::paramGain27L, false); + editParameter(ZamGEQ31X2Plugin::paramGain27L, false); else if (slider == fSliderGain28L) - d_editParameter(ZamGEQ31X2Plugin::paramGain28L, false); + editParameter(ZamGEQ31X2Plugin::paramGain28L, false); else if (slider == fSliderGain29L) - d_editParameter(ZamGEQ31X2Plugin::paramGain29L, false); + editParameter(ZamGEQ31X2Plugin::paramGain29L, false); else if (slider == fSliderGain30L) - d_editParameter(ZamGEQ31X2Plugin::paramGain30L, false); + editParameter(ZamGEQ31X2Plugin::paramGain30L, false); else if (slider == fSliderGain31L) - d_editParameter(ZamGEQ31X2Plugin::paramGain31L, false); + editParameter(ZamGEQ31X2Plugin::paramGain31L, false); else if (slider == fSliderGain1R) - d_editParameter(ZamGEQ31X2Plugin::paramGain1R, false); + editParameter(ZamGEQ31X2Plugin::paramGain1R, false); else if (slider == fSliderGain2R) - d_editParameter(ZamGEQ31X2Plugin::paramGain2R, false); + editParameter(ZamGEQ31X2Plugin::paramGain2R, false); else if (slider == fSliderGain3R) - d_editParameter(ZamGEQ31X2Plugin::paramGain3R, false); + editParameter(ZamGEQ31X2Plugin::paramGain3R, false); else if (slider == fSliderGain4R) - d_editParameter(ZamGEQ31X2Plugin::paramGain4R, false); + editParameter(ZamGEQ31X2Plugin::paramGain4R, false); else if (slider == fSliderGain5R) - d_editParameter(ZamGEQ31X2Plugin::paramGain5R, false); + editParameter(ZamGEQ31X2Plugin::paramGain5R, false); else if (slider == fSliderGain6R) - d_editParameter(ZamGEQ31X2Plugin::paramGain6R, false); + editParameter(ZamGEQ31X2Plugin::paramGain6R, false); else if (slider == fSliderGain7R) - d_editParameter(ZamGEQ31X2Plugin::paramGain7R, false); + editParameter(ZamGEQ31X2Plugin::paramGain7R, false); else if (slider == fSliderGain8R) - d_editParameter(ZamGEQ31X2Plugin::paramGain8R, false); + editParameter(ZamGEQ31X2Plugin::paramGain8R, false); else if (slider == fSliderGain9R) - d_editParameter(ZamGEQ31X2Plugin::paramGain9R, false); + editParameter(ZamGEQ31X2Plugin::paramGain9R, false); else if (slider == fSliderGain10R) - d_editParameter(ZamGEQ31X2Plugin::paramGain10R, false); + editParameter(ZamGEQ31X2Plugin::paramGain10R, false); else if (slider == fSliderGain11R) - d_editParameter(ZamGEQ31X2Plugin::paramGain11R, false); + editParameter(ZamGEQ31X2Plugin::paramGain11R, false); else if (slider == fSliderGain12R) - d_editParameter(ZamGEQ31X2Plugin::paramGain12R, false); + editParameter(ZamGEQ31X2Plugin::paramGain12R, false); else if (slider == fSliderGain13R) - d_editParameter(ZamGEQ31X2Plugin::paramGain13R, false); + editParameter(ZamGEQ31X2Plugin::paramGain13R, false); else if (slider == fSliderGain14R) - d_editParameter(ZamGEQ31X2Plugin::paramGain14R, false); + editParameter(ZamGEQ31X2Plugin::paramGain14R, false); else if (slider == fSliderGain15R) - d_editParameter(ZamGEQ31X2Plugin::paramGain15R, false); + editParameter(ZamGEQ31X2Plugin::paramGain15R, false); else if (slider == fSliderGain16R) - d_editParameter(ZamGEQ31X2Plugin::paramGain16R, false); + editParameter(ZamGEQ31X2Plugin::paramGain16R, false); else if (slider == fSliderGain17R) - d_editParameter(ZamGEQ31X2Plugin::paramGain17R, false); + editParameter(ZamGEQ31X2Plugin::paramGain17R, false); else if (slider == fSliderGain18R) - d_editParameter(ZamGEQ31X2Plugin::paramGain18R, false); + editParameter(ZamGEQ31X2Plugin::paramGain18R, false); else if (slider == fSliderGain19R) - d_editParameter(ZamGEQ31X2Plugin::paramGain19R, false); + editParameter(ZamGEQ31X2Plugin::paramGain19R, false); else if (slider == fSliderGain20R) - d_editParameter(ZamGEQ31X2Plugin::paramGain20R, false); + editParameter(ZamGEQ31X2Plugin::paramGain20R, false); else if (slider == fSliderGain21R) - d_editParameter(ZamGEQ31X2Plugin::paramGain21R, false); + editParameter(ZamGEQ31X2Plugin::paramGain21R, false); else if (slider == fSliderGain22R) - d_editParameter(ZamGEQ31X2Plugin::paramGain22R, false); + editParameter(ZamGEQ31X2Plugin::paramGain22R, false); else if (slider == fSliderGain23R) - d_editParameter(ZamGEQ31X2Plugin::paramGain23R, false); + editParameter(ZamGEQ31X2Plugin::paramGain23R, false); else if (slider == fSliderGain24R) - d_editParameter(ZamGEQ31X2Plugin::paramGain24R, false); + editParameter(ZamGEQ31X2Plugin::paramGain24R, false); else if (slider == fSliderGain25R) - d_editParameter(ZamGEQ31X2Plugin::paramGain25R, false); + editParameter(ZamGEQ31X2Plugin::paramGain25R, false); else if (slider == fSliderGain26R) - d_editParameter(ZamGEQ31X2Plugin::paramGain26R, false); + editParameter(ZamGEQ31X2Plugin::paramGain26R, false); else if (slider == fSliderGain27R) - d_editParameter(ZamGEQ31X2Plugin::paramGain27R, false); + editParameter(ZamGEQ31X2Plugin::paramGain27R, false); else if (slider == fSliderGain28R) - d_editParameter(ZamGEQ31X2Plugin::paramGain28R, false); + editParameter(ZamGEQ31X2Plugin::paramGain28R, false); else if (slider == fSliderGain29R) - d_editParameter(ZamGEQ31X2Plugin::paramGain29R, false); + editParameter(ZamGEQ31X2Plugin::paramGain29R, false); else if (slider == fSliderGain30R) - d_editParameter(ZamGEQ31X2Plugin::paramGain30R, false); + editParameter(ZamGEQ31X2Plugin::paramGain30R, false); else if (slider == fSliderGain31R) - d_editParameter(ZamGEQ31X2Plugin::paramGain31R, false); + editParameter(ZamGEQ31X2Plugin::paramGain31R, false); } void ZamGEQ31X2UI::imageSliderValueChanged(ImageSlider* slider, float value) { if (slider == fSliderMaster) - d_setParameterValue(ZamGEQ31X2Plugin::paramMaster, value); + setParameterValue(ZamGEQ31X2Plugin::paramMaster, value); else if (slider == fSliderGain1L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain1L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain1L, value); else if (slider == fSliderGain2L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain2L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain2L, value); else if (slider == fSliderGain3L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain3L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain3L, value); else if (slider == fSliderGain4L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain4L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain4L, value); else if (slider == fSliderGain5L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain5L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain5L, value); else if (slider == fSliderGain6L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain6L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain6L, value); else if (slider == fSliderGain7L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain7L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain7L, value); else if (slider == fSliderGain8L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain8L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain8L, value); else if (slider == fSliderGain9L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain9L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain9L, value); else if (slider == fSliderGain10L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain10L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain10L, value); else if (slider == fSliderGain11L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain11L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain11L, value); else if (slider == fSliderGain12L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain12L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain12L, value); else if (slider == fSliderGain13L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain13L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain13L, value); else if (slider == fSliderGain14L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain14L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain14L, value); else if (slider == fSliderGain15L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain15L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain15L, value); else if (slider == fSliderGain16L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain16L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain16L, value); else if (slider == fSliderGain17L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain17L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain17L, value); else if (slider == fSliderGain18L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain18L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain18L, value); else if (slider == fSliderGain19L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain19L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain19L, value); else if (slider == fSliderGain20L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain20L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain20L, value); else if (slider == fSliderGain21L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain21L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain21L, value); else if (slider == fSliderGain22L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain22L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain22L, value); else if (slider == fSliderGain23L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain23L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain23L, value); else if (slider == fSliderGain24L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain24L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain24L, value); else if (slider == fSliderGain25L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain25L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain25L, value); else if (slider == fSliderGain26L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain26L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain26L, value); else if (slider == fSliderGain27L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain27L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain27L, value); else if (slider == fSliderGain28L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain28L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain28L, value); else if (slider == fSliderGain29L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain29L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain29L, value); else if (slider == fSliderGain30L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain30L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain30L, value); else if (slider == fSliderGain31L) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain31L, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain31L, value); else if (slider == fSliderGain1R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain1R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain1R, value); else if (slider == fSliderGain2R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain2R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain2R, value); else if (slider == fSliderGain3R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain3R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain3R, value); else if (slider == fSliderGain4R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain4R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain4R, value); else if (slider == fSliderGain5R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain5R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain5R, value); else if (slider == fSliderGain6R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain6R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain6R, value); else if (slider == fSliderGain7R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain7R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain7R, value); else if (slider == fSliderGain8R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain8R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain8R, value); else if (slider == fSliderGain9R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain9R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain9R, value); else if (slider == fSliderGain10R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain10R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain10R, value); else if (slider == fSliderGain11R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain11R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain11R, value); else if (slider == fSliderGain12R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain12R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain12R, value); else if (slider == fSliderGain13R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain13R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain13R, value); else if (slider == fSliderGain14R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain14R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain14R, value); else if (slider == fSliderGain15R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain15R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain15R, value); else if (slider == fSliderGain16R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain16R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain16R, value); else if (slider == fSliderGain17R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain17R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain17R, value); else if (slider == fSliderGain18R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain18R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain18R, value); else if (slider == fSliderGain19R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain19R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain19R, value); else if (slider == fSliderGain20R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain20R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain20R, value); else if (slider == fSliderGain21R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain21R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain21R, value); else if (slider == fSliderGain22R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain22R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain22R, value); else if (slider == fSliderGain23R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain23R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain23R, value); else if (slider == fSliderGain24R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain24R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain24R, value); else if (slider == fSliderGain25R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain25R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain25R, value); else if (slider == fSliderGain26R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain26R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain26R, value); else if (slider == fSliderGain27R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain27R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain27R, value); else if (slider == fSliderGain28R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain28R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain28R, value); else if (slider == fSliderGain29R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain29R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain29R, value); else if (slider == fSliderGain30R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain30R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain30R, value); else if (slider == fSliderGain31R) - d_setParameterValue(ZamGEQ31X2Plugin::paramGain31R, value); + setParameterValue(ZamGEQ31X2Plugin::paramGain31R, value); } void ZamGEQ31X2UI::onDisplay() diff --git a/plugins/ZamGEQ31X2/ZamGEQ31X2UI.hpp b/plugins/ZamGEQ31X2/ZamGEQ31X2UI.hpp index f2250fa..3c8f7c4 100644 --- a/plugins/ZamGEQ31X2/ZamGEQ31X2UI.hpp +++ b/plugins/ZamGEQ31X2/ZamGEQ31X2UI.hpp @@ -55,8 +55,8 @@ protected: // ------------------------------------------------------------------- // DSP Callbacks - void d_parameterChanged(uint32_t index, float value) override; - void d_programChanged(uint32_t index) override; + void parameterChanged(uint32_t index, float value) override; + void programLoaded(uint32_t index) override; // ------------------------------------------------------------------- // Widget Callbacks diff --git a/plugins/ZamGate/ZamGatePlugin.cpp b/plugins/ZamGate/ZamGatePlugin.cpp index 3924a4c..25b5b9b 100644 --- a/plugins/ZamGate/ZamGatePlugin.cpp +++ b/plugins/ZamGate/ZamGatePlugin.cpp @@ -25,13 +25,13 @@ ZamGatePlugin::ZamGatePlugin() : Plugin(paramCount, 1, 0) // 1 program, 0 states { // set default values - d_setProgram(0); + loadProgram(0); } // ----------------------------------------------------------------------- // Init -void ZamGatePlugin::d_initProgramName(uint32_t index, d_string& programName) +void ZamGatePlugin::initProgramName(uint32_t index, String& programName) { if (index != 0) return; @@ -42,7 +42,7 @@ void ZamGatePlugin::d_initProgramName(uint32_t index, d_string& programName) // ----------------------------------------------------------------------- // Internal data -void ZamGatePlugin::d_initParameter(uint32_t index, Parameter& parameter) +void ZamGatePlugin::initParameter(uint32_t index, Parameter& parameter) { switch (index) { @@ -106,7 +106,7 @@ void ZamGatePlugin::d_initParameter(uint32_t index, Parameter& parameter) // ----------------------------------------------------------------------- // Internal data -float ZamGatePlugin::d_getParameterValue(uint32_t index) const +float ZamGatePlugin::getParameterValue(uint32_t index) const { switch (index) { @@ -133,7 +133,7 @@ float ZamGatePlugin::d_getParameterValue(uint32_t index) const } } -void ZamGatePlugin::d_setParameterValue(uint32_t index, float value) +void ZamGatePlugin::setParameterValue(uint32_t index, float value) { switch (index) { @@ -158,7 +158,7 @@ void ZamGatePlugin::d_setParameterValue(uint32_t index, float value) } } -void ZamGatePlugin::d_setProgram(uint32_t index) +void ZamGatePlugin::loadProgram(uint32_t index) { attack = 50.0; release = 100.0; @@ -166,13 +166,13 @@ void ZamGatePlugin::d_setProgram(uint32_t index) gainr = 0.0; makeup = 0.0; outlevel = -45.0; - d_activate(); + activate(); } // ----------------------------------------------------------------------- // Process -void ZamGatePlugin::d_activate() +void ZamGatePlugin::activate() { int i; gatestatel = 0.f; @@ -202,7 +202,7 @@ float ZamGatePlugin::averageabs(float samples[]) return sqrt(average); } -void ZamGatePlugin::d_run(const float** inputs, float** outputs, uint32_t frames) +void ZamGatePlugin::run(const float** inputs, float** outputs, uint32_t frames) { uint32_t i; float absamplel, absample; @@ -211,7 +211,7 @@ void ZamGatePlugin::d_run(const float** inputs, float** outputs, uint32_t frames float gl; float ming; float fs; - fs = d_getSampleRate(); + fs = getSampleRate(); gl = gatestatel; att = 1000.f / (attack * fs); rel = 1000.f / (release * fs); diff --git a/plugins/ZamGate/ZamGatePlugin.hpp b/plugins/ZamGate/ZamGatePlugin.hpp index a891029..f80f3e2 100644 --- a/plugins/ZamGate/ZamGatePlugin.hpp +++ b/plugins/ZamGate/ZamGatePlugin.hpp @@ -47,27 +47,27 @@ protected: // ------------------------------------------------------------------- // Information - const char* d_getLabel() const noexcept override + const char* getLabel() const noexcept override { return "ZamGate"; } - const char* d_getMaker() const noexcept override + const char* getMaker() const noexcept override { return "Damien Zammit"; } - const char* d_getLicense() const noexcept override + const char* getLicense() const noexcept override { return "GPL v2+"; } - uint32_t d_getVersion() const noexcept override + uint32_t getVersion() const noexcept override { return 0x1000; } - int64_t d_getUniqueId() const noexcept override + int64_t getUniqueId() const noexcept override { return d_cconst('Z', 'G', 'A', 'T'); } @@ -75,19 +75,19 @@ protected: // ------------------------------------------------------------------- // Init - void d_initParameter(uint32_t index, Parameter& parameter) override; - void d_initProgramName(uint32_t index, d_string& programName) override; + void initParameter(uint32_t index, Parameter& parameter) override; + void initProgramName(uint32_t index, String& programName) override; // ------------------------------------------------------------------- // Internal data - float d_getParameterValue(uint32_t index) const override; - void d_setParameterValue(uint32_t index, float value) override; - void d_setProgram(uint32_t index) override; + float getParameterValue(uint32_t index) const override; + void setParameterValue(uint32_t index, float value) override; + void loadProgram(uint32_t index) override; // ------------------------------------------------------------------- - void d_activate() override; - void d_run(const float** inputs, float** outputs, uint32_t frames) override; + void activate() override; + void run(const float** inputs, float** outputs, uint32_t frames) override; static inline float sanitize_denormal(float v) { diff --git a/plugins/ZamGate/ZamGateUI.cpp b/plugins/ZamGate/ZamGateUI.cpp index 123ca90..0d8b895 100644 --- a/plugins/ZamGate/ZamGateUI.cpp +++ b/plugins/ZamGate/ZamGateUI.cpp @@ -79,13 +79,13 @@ ZamGateUI::ZamGateUI() fKnobMakeup->setCallback(this); // set default values - d_programChanged(0); + programLoaded(0); } // ----------------------------------------------------------------------- // DSP Callbacks -void ZamGateUI::d_parameterChanged(uint32_t index, float value) +void ZamGateUI::parameterChanged(uint32_t index, float value) { switch (index) { @@ -118,7 +118,7 @@ void ZamGateUI::d_parameterChanged(uint32_t index, float value) } } -void ZamGateUI::d_programChanged(uint32_t index) +void ZamGateUI::programLoaded(uint32_t index) { // Default values fKnobAttack->setValue(50.0f); @@ -132,17 +132,17 @@ void ZamGateUI::d_programChanged(uint32_t index) void ZamGateUI::imageKnobDragStarted(ImageKnob* knob) { - d_editParameter(knob->getId(), true); + editParameter(knob->getId(), true); } void ZamGateUI::imageKnobDragFinished(ImageKnob* knob) { - d_editParameter(knob->getId(), false); + editParameter(knob->getId(), false); } void ZamGateUI::imageKnobValueChanged(ImageKnob* knob, float value) { - d_setParameterValue(knob->getId(), value); + setParameterValue(knob->getId(), value); } void ZamGateUI::onDisplay() diff --git a/plugins/ZamGate/ZamGateUI.hpp b/plugins/ZamGate/ZamGateUI.hpp index 53d0092..84a3d2d 100644 --- a/plugins/ZamGate/ZamGateUI.hpp +++ b/plugins/ZamGate/ZamGateUI.hpp @@ -39,8 +39,8 @@ protected: // ------------------------------------------------------------------- // DSP Callbacks - void d_parameterChanged(uint32_t index, float value) override; - void d_programChanged(uint32_t index) ; + void parameterChanged(uint32_t index, float value) override; + void programLoaded(uint32_t index) override; // ------------------------------------------------------------------- diff --git a/plugins/ZamGateX2/ZamGateX2Plugin.cpp b/plugins/ZamGateX2/ZamGateX2Plugin.cpp index af61dbc..0e29d38 100644 --- a/plugins/ZamGateX2/ZamGateX2Plugin.cpp +++ b/plugins/ZamGateX2/ZamGateX2Plugin.cpp @@ -25,13 +25,13 @@ ZamGateX2Plugin::ZamGateX2Plugin() : Plugin(paramCount, 1, 0) // 1 program, 0 states { // set default values - d_setProgram(0); + loadProgram(0); } // ----------------------------------------------------------------------- // Init -void ZamGateX2Plugin::d_initProgramName(uint32_t index, d_string& programName) +void ZamGateX2Plugin::initProgramName(uint32_t index, String& programName) { if (index != 0) return; @@ -42,7 +42,7 @@ void ZamGateX2Plugin::d_initProgramName(uint32_t index, d_string& programName) // ----------------------------------------------------------------------- // Internal data -void ZamGateX2Plugin::d_initParameter(uint32_t index, Parameter& parameter) +void ZamGateX2Plugin::initParameter(uint32_t index, Parameter& parameter) { switch (index) { @@ -106,7 +106,7 @@ void ZamGateX2Plugin::d_initParameter(uint32_t index, Parameter& parameter) // ----------------------------------------------------------------------- // Internal data -float ZamGateX2Plugin::d_getParameterValue(uint32_t index) const +float ZamGateX2Plugin::getParameterValue(uint32_t index) const { switch (index) { @@ -133,7 +133,7 @@ float ZamGateX2Plugin::d_getParameterValue(uint32_t index) const } } -void ZamGateX2Plugin::d_setParameterValue(uint32_t index, float value) +void ZamGateX2Plugin::setParameterValue(uint32_t index, float value) { switch (index) { @@ -158,7 +158,7 @@ void ZamGateX2Plugin::d_setParameterValue(uint32_t index, float value) } } -void ZamGateX2Plugin::d_setProgram(uint32_t index) +void ZamGateX2Plugin::loadProgram(uint32_t index) { attack = 50.0; release = 100.0; @@ -166,13 +166,13 @@ void ZamGateX2Plugin::d_setProgram(uint32_t index) gainr = 0.0; makeup = 0.0; outlevel = -45.0; - d_activate(); + activate(); } // ----------------------------------------------------------------------- // Process -void ZamGateX2Plugin::d_activate() +void ZamGateX2Plugin::activate() { int i; gatestatel = 0.f; @@ -213,7 +213,7 @@ float ZamGateX2Plugin::averageabs(float samples[]) return sqrt(average); } -void ZamGateX2Plugin::d_run(const float** inputs, float** outputs, uint32_t frames) +void ZamGateX2Plugin::run(const float** inputs, float** outputs, uint32_t frames) { uint32_t i; float absamplel, absampler, absample; @@ -222,7 +222,7 @@ void ZamGateX2Plugin::d_run(const float** inputs, float** outputs, uint32_t fram float gl, gr; float ming; float fs; - fs = d_getSampleRate(); + fs = getSampleRate(); gl = gatestatel; gr = gatestater; att = 1000.f / (attack * fs); diff --git a/plugins/ZamGateX2/ZamGateX2Plugin.hpp b/plugins/ZamGateX2/ZamGateX2Plugin.hpp index 0b6533e..586493a 100644 --- a/plugins/ZamGateX2/ZamGateX2Plugin.hpp +++ b/plugins/ZamGateX2/ZamGateX2Plugin.hpp @@ -47,27 +47,27 @@ protected: // ------------------------------------------------------------------- // Information - const char* d_getLabel() const noexcept override + const char* getLabel() const noexcept override { return "ZamGateX2"; } - const char* d_getMaker() const noexcept override + const char* getMaker() const noexcept override { return "Damien Zammit"; } - const char* d_getLicense() const noexcept override + const char* getLicense() const noexcept override { return "GPL v2+"; } - uint32_t d_getVersion() const noexcept override + uint32_t getVersion() const noexcept override { return 0x1000; } - int64_t d_getUniqueId() const noexcept override + int64_t getUniqueId() const noexcept override { return d_cconst('Z', 'G', 'T', '2'); } @@ -75,19 +75,19 @@ protected: // ------------------------------------------------------------------- // Init - void d_initParameter(uint32_t index, Parameter& parameter) override; - void d_initProgramName(uint32_t index, d_string& programName) override; + void initParameter(uint32_t index, Parameter& parameter) override; + void initProgramName(uint32_t index, String& programName) override; // ------------------------------------------------------------------- // Internal data - float d_getParameterValue(uint32_t index) const override; - void d_setParameterValue(uint32_t index, float value) override; - void d_setProgram(uint32_t index) override; + float getParameterValue(uint32_t index) const override; + void setParameterValue(uint32_t index, float value) override; + void loadProgram(uint32_t index) override; // ------------------------------------------------------------------- - void d_activate() override; - void d_run(const float** inputs, float** outputs, uint32_t frames) override; + void activate() override; + void run(const float** inputs, float** outputs, uint32_t frames) override; static inline float sanitize_denormal(float v) { diff --git a/plugins/ZamGateX2/ZamGateX2UI.cpp b/plugins/ZamGateX2/ZamGateX2UI.cpp index 6372173..c682380 100644 --- a/plugins/ZamGateX2/ZamGateX2UI.cpp +++ b/plugins/ZamGateX2/ZamGateX2UI.cpp @@ -79,13 +79,13 @@ ZamGateX2UI::ZamGateX2UI() fKnobMakeup->setCallback(this); // set default values - d_programChanged(0); + programLoaded(0); } // ----------------------------------------------------------------------- // DSP Callbacks -void ZamGateX2UI::d_parameterChanged(uint32_t index, float value) +void ZamGateX2UI::parameterChanged(uint32_t index, float value) { switch (index) { @@ -118,7 +118,7 @@ void ZamGateX2UI::d_parameterChanged(uint32_t index, float value) } } -void ZamGateX2UI::d_programChanged(uint32_t index) +void ZamGateX2UI::programLoaded(uint32_t index) { // Default values fKnobAttack->setValue(50.0f); @@ -132,17 +132,17 @@ void ZamGateX2UI::d_programChanged(uint32_t index) void ZamGateX2UI::imageKnobDragStarted(ImageKnob* knob) { - d_editParameter(knob->getId(), true); + editParameter(knob->getId(), true); } void ZamGateX2UI::imageKnobDragFinished(ImageKnob* knob) { - d_editParameter(knob->getId(), false); + editParameter(knob->getId(), false); } void ZamGateX2UI::imageKnobValueChanged(ImageKnob* knob, float value) { - d_setParameterValue(knob->getId(), value); + setParameterValue(knob->getId(), value); } void ZamGateX2UI::onDisplay() diff --git a/plugins/ZamGateX2/ZamGateX2UI.hpp b/plugins/ZamGateX2/ZamGateX2UI.hpp index 9a342ba..7a80933 100644 --- a/plugins/ZamGateX2/ZamGateX2UI.hpp +++ b/plugins/ZamGateX2/ZamGateX2UI.hpp @@ -39,8 +39,8 @@ protected: // ------------------------------------------------------------------- // DSP Callbacks - void d_parameterChanged(uint32_t index, float value) override; - void d_programChanged(uint32_t index) ; + void parameterChanged(uint32_t index, float value) override; + void programLoaded(uint32_t index) override; // ------------------------------------------------------------------- diff --git a/plugins/ZamNoise/ZamNoisePlugin.cpp b/plugins/ZamNoise/ZamNoisePlugin.cpp index 18a3dfb..3347340 100644 --- a/plugins/ZamNoise/ZamNoisePlugin.cpp +++ b/plugins/ZamNoise/ZamNoisePlugin.cpp @@ -25,14 +25,14 @@ ZamNoisePlugin::ZamNoisePlugin() : Plugin(paramCount, 1, 0) // 1 program, 0 states { - ZamNoisePlugin::init(d_getSampleRate()); - zamnoise = new Denoise(d_getSampleRate()); + ZamNoisePlugin::init(getSampleRate()); + zamnoise = new Denoise(getSampleRate()); // set default values - d_setProgram(0); + loadProgram(0); // reset - d_deactivate(); + deactivate(); } ZamNoisePlugin::~ZamNoisePlugin() @@ -44,7 +44,7 @@ ZamNoisePlugin::~ZamNoisePlugin() // ----------------------------------------------------------------------- // Init -void ZamNoisePlugin::d_initParameter(uint32_t index, Parameter& parameter) +void ZamNoisePlugin::initParameter(uint32_t index, Parameter& parameter) { switch (index) { @@ -62,7 +62,7 @@ void ZamNoisePlugin::d_initParameter(uint32_t index, Parameter& parameter) } } -void ZamNoisePlugin::d_initProgramName(uint32_t index, d_string& programName) +void ZamNoisePlugin::initProgramName(uint32_t index, String& programName) { if (index != 0) return; @@ -73,7 +73,7 @@ void ZamNoisePlugin::d_initProgramName(uint32_t index, d_string& programName) // ----------------------------------------------------------------------- // Internal data -float ZamNoisePlugin::d_getParameterValue(uint32_t index) const +float ZamNoisePlugin::getParameterValue(uint32_t index) const { switch (index) { @@ -86,7 +86,7 @@ float ZamNoisePlugin::d_getParameterValue(uint32_t index) const } } -void ZamNoisePlugin::d_setParameterValue(uint32_t index, float value) +void ZamNoisePlugin::setParameterValue(uint32_t index, float value) { switch (index) { @@ -99,14 +99,14 @@ void ZamNoisePlugin::d_setParameterValue(uint32_t index, float value) } } -void ZamNoisePlugin::d_setProgram(uint32_t index) +void ZamNoisePlugin::loadProgram(uint32_t index) { if (index != 0) return; noisetoggle = 0.f; - d_activate(); + activate(); } @@ -126,15 +126,15 @@ void ZamNoisePlugin::init (float fsamp) // ----------------------------------------------------------------------- // Process -void ZamNoisePlugin::d_activate() +void ZamNoisePlugin::activate() { } -void ZamNoisePlugin::d_deactivate() +void ZamNoisePlugin::deactivate() { } -void ZamNoisePlugin::d_run(const float** inputs, float** outputs, uint32_t frames) +void ZamNoisePlugin::run(const float** inputs, float** outputs, uint32_t frames) { zamnoise->process(inputs[0], outputs[0], buffer.cbi, frames, (int)noisetoggle); } diff --git a/plugins/ZamNoise/ZamNoisePlugin.hpp b/plugins/ZamNoise/ZamNoisePlugin.hpp index 4870148..dada683 100644 --- a/plugins/ZamNoise/ZamNoisePlugin.hpp +++ b/plugins/ZamNoise/ZamNoisePlugin.hpp @@ -47,27 +47,27 @@ protected: // ------------------------------------------------------------------- // Information - const char* d_getLabel() const noexcept override + const char* getLabel() const noexcept override { return "ZamNoise"; } - const char* d_getMaker() const noexcept override + const char* getMaker() const noexcept override { return "Damien Zammit"; } - const char* d_getLicense() const noexcept override + const char* getLicense() const noexcept override { return "GPL v2+"; } - uint32_t d_getVersion() const noexcept override + uint32_t getVersion() const noexcept override { return 0x1000; } - int64_t d_getUniqueId() const noexcept override + int64_t getUniqueId() const noexcept override { return d_cconst('Z', 'N', 'O', 'I'); } @@ -75,20 +75,20 @@ protected: // ------------------------------------------------------------------- // Init - void d_initParameter(uint32_t index, Parameter& parameter) ; - void d_initProgramName(uint32_t index, d_string& programName) ; + void initParameter(uint32_t index, Parameter& parameter) override; + void initProgramName(uint32_t index, String& programName) override; // ------------------------------------------------------------------- // Internal data - float d_getParameterValue(uint32_t index) const ; - void d_setParameterValue(uint32_t index, float value) ; - void d_setProgram(uint32_t index) ; + float getParameterValue(uint32_t index) const override; + void setParameterValue(uint32_t index, float value) override; + void loadProgram(uint32_t index) override; // ------------------------------------------------------------------- - void d_activate() ; - void d_deactivate() ; - void d_run(const float** inputs, float** outputs, uint32_t frames) override; + void activate() override; + void deactivate() override; + void run(const float** inputs, float** outputs, uint32_t frames) override; // ------------------------------------------------------------------- float noisetoggle; diff --git a/plugins/ZamNoise/ZamNoiseUI.cpp b/plugins/ZamNoise/ZamNoiseUI.cpp index 26a3ca9..a2001d6 100644 --- a/plugins/ZamNoise/ZamNoiseUI.cpp +++ b/plugins/ZamNoise/ZamNoiseUI.cpp @@ -40,7 +40,7 @@ ZamNoiseUI::ZamNoiseUI() fToggleNoise->setCallback(this); fToggleNoise->setValue(0.f); - d_programChanged(0); + programLoaded(0); } ZamNoiseUI::~ZamNoiseUI() @@ -50,7 +50,7 @@ ZamNoiseUI::~ZamNoiseUI() // ----------------------------------------------------------------------- // DSP Callbacks -void ZamNoiseUI::d_parameterChanged(uint32_t index, float value) +void ZamNoiseUI::parameterChanged(uint32_t index, float value) { switch (index) { @@ -61,7 +61,7 @@ void ZamNoiseUI::d_parameterChanged(uint32_t index, float value) } -void ZamNoiseUI::d_programChanged(uint32_t index) +void ZamNoiseUI::programLoaded(uint32_t index) { if (index != 0) return; @@ -73,7 +73,7 @@ void ZamNoiseUI::imageToggleClicked(ImageToggle*, int) { float toggle = fToggleNoise->getValue(); fToggleNoise->setValue(toggle); - d_setParameterValue(ZamNoisePlugin::paramNoiseToggle, toggle); + setParameterValue(ZamNoisePlugin::paramNoiseToggle, toggle); } diff --git a/plugins/ZamNoise/ZamNoiseUI.hpp b/plugins/ZamNoise/ZamNoiseUI.hpp index b423f3b..5eb72e9 100644 --- a/plugins/ZamNoise/ZamNoiseUI.hpp +++ b/plugins/ZamNoise/ZamNoiseUI.hpp @@ -44,8 +44,8 @@ protected: // ------------------------------------------------------------------- // DSP Callbacks - void d_parameterChanged(uint32_t index, float value) override; - void d_programChanged(uint32_t index) ; + void parameterChanged(uint32_t index, float value) override; + void programLoaded(uint32_t index) override; // ------------------------------------------------------------------- diff --git a/plugins/ZamPiano/ZamPianoPlugin.cpp b/plugins/ZamPiano/ZamPianoPlugin.cpp index 296da98..28f57df 100644 --- a/plugins/ZamPiano/ZamPianoPlugin.cpp +++ b/plugins/ZamPiano/ZamPianoPlugin.cpp @@ -25,7 +25,7 @@ ZamPianoPlugin::ZamPianoPlugin() : Plugin(paramCount, 1, 0) // 1 program, 0 states { // set default values - d_setProgram(0); + loadProgram(0); } ZamPianoPlugin::~ZamPianoPlugin() @@ -40,7 +40,7 @@ ZamPianoPlugin::~ZamPianoPlugin() // ----------------------------------------------------------------------- // Init -void ZamPianoPlugin::d_initParameter(uint32_t index, Parameter& parameter) +void ZamPianoPlugin::initParameter(uint32_t index, Parameter& parameter) { switch (index) { @@ -146,7 +146,7 @@ void ZamPianoPlugin::d_initParameter(uint32_t index, Parameter& parameter) } } -void ZamPianoPlugin::d_initProgramName(uint32_t index, d_string& programName) +void ZamPianoPlugin::initProgramName(uint32_t index, String& programName) { if (index != 0) return; @@ -157,7 +157,7 @@ void ZamPianoPlugin::d_initProgramName(uint32_t index, d_string& programName) // ----------------------------------------------------------------------- // Internal data -float ZamPianoPlugin::d_getParameterValue(uint32_t index) const +float ZamPianoPlugin::getParameterValue(uint32_t index) const { switch (index) { @@ -200,7 +200,7 @@ float ZamPianoPlugin::d_getParameterValue(uint32_t index) const } } -void ZamPianoPlugin::d_setParameterValue(uint32_t index, float value) +void ZamPianoPlugin::setParameterValue(uint32_t index, float value) { switch (index) { @@ -240,22 +240,22 @@ void ZamPianoPlugin::d_setParameterValue(uint32_t index, float value) } } -void ZamPianoPlugin::d_setProgram(uint32_t index) +void ZamPianoPlugin::loadProgram(uint32_t index) { if (index != 0) return; /* Default parameter values */ /* reset filter values */ - d_activate(); + activate(); } /* -void ZamPianoPlugin::d_setState(const char*, const char*) +void ZamPianoPlugin::setState(const char*, const char*) { } -void ZamPianoPlugin::d_initStateKey(unsigned int, d_string&) +void ZamPianoPlugin::initStateKey(unsigned int, String&) { } */ @@ -263,7 +263,7 @@ void ZamPianoPlugin::d_initStateKey(unsigned int, d_string&) // ----------------------------------------------------------------------- // Process -void ZamPianoPlugin::d_activate() +void ZamPianoPlugin::activate() { int i; for (i = 0; i < 88; i++) { @@ -288,7 +288,7 @@ void ZamPianoPlugin::d_activate() } } -void ZamPianoPlugin::d_run(const float** inputs, float** outputs, uint32_t frames, +void ZamPianoPlugin::run(const float** inputs, float** outputs, uint32_t frames, const MidiEvent* midievent, uint32_t midicount) { uint32_t i, j; diff --git a/plugins/ZamPiano/ZamPianoPlugin.hpp b/plugins/ZamPiano/ZamPianoPlugin.hpp index 414f9ad..ae4561e 100644 --- a/plugins/ZamPiano/ZamPianoPlugin.hpp +++ b/plugins/ZamPiano/ZamPianoPlugin.hpp @@ -60,27 +60,27 @@ protected: // ------------------------------------------------------------------- // Information - const char* d_getLabel() const noexcept override + const char* getLabel() const noexcept override { return "ZamPiano"; } - const char* d_getMaker() const noexcept override + const char* getMaker() const noexcept override { return "Damien Zammit"; } - const char* d_getLicense() const noexcept override + const char* getLicense() const noexcept override { return "GPL v2+"; } - uint32_t d_getVersion() const noexcept override + uint32_t getVersion() const noexcept override { return 0x1000; } - int64_t d_getUniqueId() const noexcept override + int64_t getUniqueId() const noexcept override { return d_cconst('Z', 'P', 'N', '2'); } @@ -88,15 +88,15 @@ protected: // ------------------------------------------------------------------- // Init - void d_initParameter(uint32_t index, Parameter& parameter) ; - void d_initProgramName(uint32_t index, d_string& programName) ; + void initParameter(uint32_t index, Parameter& parameter) ; + void initProgramName(uint32_t index, String& programName) ; // ------------------------------------------------------------------- // Internal data - float d_getParameterValue(uint32_t index) const override; - void d_setParameterValue(uint32_t index, float value) override; - void d_setProgram(uint32_t index) ; + float getParameterValue(uint32_t index) const override; + void setParameterValue(uint32_t index, float value) override; + void loadProgram(uint32_t index) override; // ------------------------------------------------------------------- // Process @@ -118,8 +118,8 @@ protected: return (20.f*log10(g)); } - void d_activate() override; - void d_run(const float** inputs, float** outputs, uint32_t frames, + void activate() override; + void run(const float** inputs, float** outputs, uint32_t frames, const MidiEvent* midievent, uint32_t midicount) override; // ------------------------------------------------------------------- diff --git a/plugins/ZamPiano/ZamPianoUI.cpp b/plugins/ZamPiano/ZamPianoUI.cpp index 8c384b4..47f1610 100644 --- a/plugins/ZamPiano/ZamPianoUI.cpp +++ b/plugins/ZamPiano/ZamPianoUI.cpp @@ -96,13 +96,13 @@ ZamPianoUI::ZamPianoUI() fKnobWidth->setCallback(this); // set default values - d_programChanged(0); + programLoaded(0); } // ----------------------------------------------------------------------- // DSP Callbacks -void ZamPianoUI::d_parameterChanged(uint32_t index, float value) +void ZamPianoUI::parameterChanged(uint32_t index, float value) { switch (index) { @@ -133,7 +133,7 @@ void ZamPianoUI::d_parameterChanged(uint32_t index, float value) } } -void ZamPianoUI::d_programChanged(uint32_t index) +void ZamPianoUI::programLoaded(uint32_t index) { if (index != 0) return; @@ -154,61 +154,61 @@ void ZamPianoUI::d_programChanged(uint32_t index) void ZamPianoUI::imageKnobDragStarted(ImageKnob* knob) { if (knob == fKnobBright) - d_editParameter(ZamPianoPlugin::paramBright, true); + editParameter(ZamPianoPlugin::paramBright, true); else if (knob == fKnobDetune) - d_editParameter(ZamPianoPlugin::paramDetuning, true); + editParameter(ZamPianoPlugin::paramDetuning, true); else if (knob == fKnobHammer) - d_editParameter(ZamPianoPlugin::paramHammerHard, true); + editParameter(ZamPianoPlugin::paramHammerHard, true); else if (knob == fKnobStiff) - d_editParameter(ZamPianoPlugin::paramStiffness, true); + editParameter(ZamPianoPlugin::paramStiffness, true); else if (knob == fKnobReverbGain) - d_editParameter(ZamPianoPlugin::paramReverbGain, true); + editParameter(ZamPianoPlugin::paramReverbGain, true); else if (knob == fKnobReverbRoom) - d_editParameter(ZamPianoPlugin::paramReverbRoom, true); + editParameter(ZamPianoPlugin::paramReverbRoom, true); else if (knob == fKnobPan) - d_editParameter(ZamPianoPlugin::paramPanAngle, true); + editParameter(ZamPianoPlugin::paramPanAngle, true); else if (knob == fKnobWidth) - d_editParameter(ZamPianoPlugin::paramSpatialWidth, true); + editParameter(ZamPianoPlugin::paramSpatialWidth, true); } void ZamPianoUI::imageKnobDragFinished(ImageKnob* knob) { if (knob == fKnobBright) - d_editParameter(ZamPianoPlugin::paramBright, false); + editParameter(ZamPianoPlugin::paramBright, false); else if (knob == fKnobDetune) - d_editParameter(ZamPianoPlugin::paramDetuning, false); + editParameter(ZamPianoPlugin::paramDetuning, false); else if (knob == fKnobHammer) - d_editParameter(ZamPianoPlugin::paramHammerHard, false); + editParameter(ZamPianoPlugin::paramHammerHard, false); else if (knob == fKnobStiff) - d_editParameter(ZamPianoPlugin::paramStiffness, false); + editParameter(ZamPianoPlugin::paramStiffness, false); else if (knob == fKnobReverbGain) - d_editParameter(ZamPianoPlugin::paramReverbGain, false); + editParameter(ZamPianoPlugin::paramReverbGain, false); else if (knob == fKnobReverbRoom) - d_editParameter(ZamPianoPlugin::paramReverbRoom, false); + editParameter(ZamPianoPlugin::paramReverbRoom, false); else if (knob == fKnobPan) - d_editParameter(ZamPianoPlugin::paramPanAngle, false); + editParameter(ZamPianoPlugin::paramPanAngle, false); else if (knob == fKnobWidth) - d_editParameter(ZamPianoPlugin::paramSpatialWidth, false); + editParameter(ZamPianoPlugin::paramSpatialWidth, false); } void ZamPianoUI::imageKnobValueChanged(ImageKnob* knob, float value) { if (knob == fKnobBright) - d_setParameterValue(ZamPianoPlugin::paramBright, value); + setParameterValue(ZamPianoPlugin::paramBright, value); else if (knob == fKnobDetune) - d_setParameterValue(ZamPianoPlugin::paramDetuning, value); + setParameterValue(ZamPianoPlugin::paramDetuning, value); else if (knob == fKnobHammer) - d_setParameterValue(ZamPianoPlugin::paramHammerHard, value); + setParameterValue(ZamPianoPlugin::paramHammerHard, value); else if (knob == fKnobStiff) - d_setParameterValue(ZamPianoPlugin::paramStiffness, value); + setParameterValue(ZamPianoPlugin::paramStiffness, value); else if (knob == fKnobReverbGain) - d_setParameterValue(ZamPianoPlugin::paramReverbGain, value); + setParameterValue(ZamPianoPlugin::paramReverbGain, value); else if (knob == fKnobReverbRoom) - d_setParameterValue(ZamPianoPlugin::paramReverbRoom, value); + setParameterValue(ZamPianoPlugin::paramReverbRoom, value); else if (knob == fKnobPan) - d_setParameterValue(ZamPianoPlugin::paramPanAngle, value); + setParameterValue(ZamPianoPlugin::paramPanAngle, value); else if (knob == fKnobWidth) - d_setParameterValue(ZamPianoPlugin::paramSpatialWidth, value); + setParameterValue(ZamPianoPlugin::paramSpatialWidth, value); } void ZamPianoUI::onDisplay() diff --git a/plugins/ZamPiano/ZamPianoUI.hpp b/plugins/ZamPiano/ZamPianoUI.hpp index ad81a8a..c2c85b4 100644 --- a/plugins/ZamPiano/ZamPianoUI.hpp +++ b/plugins/ZamPiano/ZamPianoUI.hpp @@ -39,8 +39,8 @@ protected: // ------------------------------------------------------------------- // DSP Callbacks - void d_parameterChanged(uint32_t index, float value) override; - void d_programChanged(uint32_t index) override; + void parameterChanged(uint32_t index, float value) override; + void programLoaded(uint32_t index) override; // ------------------------------------------------------------------- // Widget Callbacks diff --git a/plugins/ZamSFZ/ZamSFZPlugin.cpp b/plugins/ZamSFZ/ZamSFZPlugin.cpp index 93ca4a5..c7bd616 100644 --- a/plugins/ZamSFZ/ZamSFZPlugin.cpp +++ b/plugins/ZamSFZ/ZamSFZPlugin.cpp @@ -25,13 +25,13 @@ ZamSFZPlugin::ZamSFZPlugin() : Plugin(paramCount, 1, 1) // 1 program, 1 state { // set default values - d_setProgram(0); + loadProgram(0); } // ----------------------------------------------------------------------- // Init -void ZamSFZPlugin::d_initParameter(uint32_t index, Parameter& parameter) +void ZamSFZPlugin::initParameter(uint32_t index, Parameter& parameter) { switch (index) { @@ -47,7 +47,7 @@ void ZamSFZPlugin::d_initParameter(uint32_t index, Parameter& parameter) } } -void ZamSFZPlugin::d_initProgramName(uint32_t index, d_string& programName) +void ZamSFZPlugin::initProgramName(uint32_t index, String& programName) { if (index != 0) return; @@ -58,7 +58,7 @@ void ZamSFZPlugin::d_initProgramName(uint32_t index, d_string& programName) // ----------------------------------------------------------------------- // Internal data -float ZamSFZPlugin::d_getParameterValue(uint32_t index) const +float ZamSFZPlugin::getParameterValue(uint32_t index) const { switch (index) { @@ -70,7 +70,7 @@ float ZamSFZPlugin::d_getParameterValue(uint32_t index) const } } -void ZamSFZPlugin::d_setParameterValue(uint32_t index, float value) +void ZamSFZPlugin::setParameterValue(uint32_t index, float value) { switch (index) { @@ -80,7 +80,7 @@ void ZamSFZPlugin::d_setParameterValue(uint32_t index, float value) } } -void ZamSFZPlugin::d_setState(const char* key, const char* value) +void ZamSFZPlugin::setState(const char* key, const char* value) { if (strcmp(key, "filepath") == 0) { char *tmp; @@ -93,18 +93,18 @@ void ZamSFZPlugin::d_setState(const char* key, const char* value) printf("Path: %s\nFile: %s\n", path.c_str(), filename.c_str()); sfz.clearsamples(); sfz.loadsamples(path, filename); - sfz.pitchshiftsamples((int)d_getSampleRate()); + sfz.pitchshiftsamples((int)getSampleRate()); loading = false; } } -void ZamSFZPlugin::d_initState(unsigned int key, d_string& val, d_string&) +void ZamSFZPlugin::initState(unsigned int key, String& val, d_string&) { if (key == 0) val = "filepath"; } -void ZamSFZPlugin::d_setProgram(uint32_t index) +void ZamSFZPlugin::loadProgram(uint32_t index) { if (index != 0) return; @@ -136,21 +136,21 @@ void ZamSFZPlugin::d_setProgram(uint32_t index) env_y[0] = 0.f; env_y[MAX_ENV-1] = 0.f; /* reset filter values */ - d_activate(); + activate(); } // ----------------------------------------------------------------------- // Process -void ZamSFZPlugin::d_activate() +void ZamSFZPlugin::activate() { } -void ZamSFZPlugin::d_run(const float**, float** outputs, uint32_t frames, +void ZamSFZPlugin::run(const float**, float** outputs, uint32_t frames, const MidiEvent* midievent, uint32_t midicount) { - float srate = d_getSampleRate(); + float srate = getSampleRate(); int slowfactor = (int) srate / (speed * 2400); // 1-20 ~ 20-1 uint32_t i; diff --git a/plugins/ZamSFZ/ZamSFZPlugin.hpp b/plugins/ZamSFZ/ZamSFZPlugin.hpp index 90ff40a..24e38cb 100644 --- a/plugins/ZamSFZ/ZamSFZPlugin.hpp +++ b/plugins/ZamSFZ/ZamSFZPlugin.hpp @@ -46,27 +46,27 @@ protected: // ------------------------------------------------------------------- // Information - const char* d_getLabel() const noexcept override + const char* getLabel() const noexcept override { return "ZamSFZ"; } - const char* d_getMaker() const noexcept override + const char* getMaker() const noexcept override { return "Damien Zammit"; } - const char* d_getLicense() const noexcept override + const char* getLicense() const noexcept override { return "GPL v2+"; } - uint32_t d_getVersion() const noexcept override + uint32_t getVersion() const noexcept override { return 0x1000; } - int64_t d_getUniqueId() const noexcept override + int64_t getUniqueId() const noexcept override { return d_cconst('Z', 'S', 'F', 'Z'); } @@ -74,16 +74,16 @@ protected: // ------------------------------------------------------------------- // Init - void d_initParameter(uint32_t index, Parameter& parameter) ; - void d_initProgramName(uint32_t index, d_string& programName) ; + void initParameter(uint32_t index, Parameter& parameter) ; + void initProgramName(uint32_t index, String& programName) ; // ------------------------------------------------------------------- // Internal data - float d_getParameterValue(uint32_t index) const override; - void d_setParameterValue(uint32_t index, float value) override; - void d_setProgram(uint32_t index) ; + float getParameterValue(uint32_t index) const override; + void setParameterValue(uint32_t index, float value) override; + void loadProgram(uint32_t index) override; // ------------------------------------------------------------------- // Process @@ -106,11 +106,11 @@ protected: } float wavetable(int i, int note); - void d_activate() override; - void d_run(const float** inputs, float** outputs, uint32_t frames, + void activate() override; + void run(const float** inputs, float** outputs, uint32_t frames, const MidiEvent* midievent, uint32_t midicount) override; - void d_setState(const char* key, const char* value) override; - void d_initState(unsigned int, d_string&, d_string&) override; + void setState(const char* key, const char* value) override; + void initState(unsigned int, String&, d_string&) override; // ------------------------------------------------------------------- private: diff --git a/plugins/ZamSFZ/ZamSFZUI.cpp b/plugins/ZamSFZ/ZamSFZUI.cpp index 3bb4d69..6c4b5f4 100644 --- a/plugins/ZamSFZ/ZamSFZUI.cpp +++ b/plugins/ZamSFZ/ZamSFZUI.cpp @@ -53,13 +53,13 @@ ZamSFZUI::ZamSFZUI() fButtonLoad->setCallback(this); // set default values - d_programChanged(0); + programLoaded(0); } // ----------------------------------------------------------------------- // DSP Callbacks -void ZamSFZUI::d_parameterChanged(uint32_t index, float value) +void ZamSFZUI::parameterChanged(uint32_t index, float value) { switch (index) { @@ -69,7 +69,7 @@ void ZamSFZUI::d_parameterChanged(uint32_t index, float value) } } -void ZamSFZUI::d_programChanged(uint32_t index) +void ZamSFZUI::programLoaded(uint32_t index) { if (index != 0) return; @@ -77,7 +77,7 @@ void ZamSFZUI::d_programChanged(uint32_t index) fKnobGain->setValue(0.0f); } -void ZamSFZUI::d_stateChanged(const char* key, const char*) +void ZamSFZUI::stateChanged(const char* key, const char*) { if (strcmp(key, "filepath") == 0) { printf("state changed... do something?\n"); @@ -88,7 +88,7 @@ void ZamSFZUI::d_uiFileBrowserSelected(const char* filename) { // if a file was selected, tell DSP if (filename != nullptr) - d_setState("filepath", filename); + setState("filepath", filename); } // ----------------------------------------------------------------------- @@ -97,19 +97,19 @@ void ZamSFZUI::d_uiFileBrowserSelected(const char* filename) void ZamSFZUI::imageKnobDragStarted(ImageKnob* knob) { if (knob == fKnobGain) - d_editParameter(ZamSFZPlugin::paramGain, true); + editParameter(ZamSFZPlugin::paramGain, true); } void ZamSFZUI::imageKnobDragFinished(ImageKnob* knob) { if (knob == fKnobGain) - d_editParameter(ZamSFZPlugin::paramGain, false); + editParameter(ZamSFZPlugin::paramGain, false); } void ZamSFZUI::imageKnobValueChanged(ImageKnob* knob, float value) { if (knob == fKnobGain) - d_setParameterValue(ZamSFZPlugin::paramGain, value); + setParameterValue(ZamSFZPlugin::paramGain, value); } void ZamSFZUI::imageButtonClicked(ImageButton*, int) diff --git a/plugins/ZamSFZ/ZamSFZUI.hpp b/plugins/ZamSFZ/ZamSFZUI.hpp index e82f406..b90daaf 100644 --- a/plugins/ZamSFZ/ZamSFZUI.hpp +++ b/plugins/ZamSFZ/ZamSFZUI.hpp @@ -42,9 +42,9 @@ protected: // ------------------------------------------------------------------- // DSP Callbacks - void d_parameterChanged(uint32_t index, float value) override; - void d_programChanged(uint32_t index) override; - void d_stateChanged(const char* key, const char* value) override; + void parameterChanged(uint32_t index, float value) override; + void programLoaded(uint32_t index) override; + void stateChanged(const char* key, const char* value) override; void d_uiFileBrowserSelected(const char* filename) override; diff --git a/plugins/ZamSynth/ZamSynthPlugin.cpp b/plugins/ZamSynth/ZamSynthPlugin.cpp index 6addb0b..8546a7a 100644 --- a/plugins/ZamSynth/ZamSynthPlugin.cpp +++ b/plugins/ZamSynth/ZamSynthPlugin.cpp @@ -25,13 +25,13 @@ ZamSynthPlugin::ZamSynthPlugin() : Plugin(paramCount, 1, 1) // 1 program, 1 state { // set default values - d_setProgram(0); + loadProgram(0); } // ----------------------------------------------------------------------- // Init -void ZamSynthPlugin::d_initParameter(uint32_t index, Parameter& parameter) +void ZamSynthPlugin::initParameter(uint32_t index, Parameter& parameter) { switch (index) { @@ -65,7 +65,7 @@ void ZamSynthPlugin::d_initParameter(uint32_t index, Parameter& parameter) } } -void ZamSynthPlugin::d_initProgramName(uint32_t index, d_string& programName) +void ZamSynthPlugin::initProgramName(uint32_t index, String& programName) { if (index != 0) return; @@ -76,7 +76,7 @@ void ZamSynthPlugin::d_initProgramName(uint32_t index, d_string& programName) // ----------------------------------------------------------------------- // Internal data -float ZamSynthPlugin::d_getParameterValue(uint32_t index) const +float ZamSynthPlugin::getParameterValue(uint32_t index) const { switch (index) { @@ -94,7 +94,7 @@ float ZamSynthPlugin::d_getParameterValue(uint32_t index) const } } -void ZamSynthPlugin::d_setParameterValue(uint32_t index, float value) +void ZamSynthPlugin::setParameterValue(uint32_t index, float value) { switch (index) { @@ -110,7 +110,7 @@ void ZamSynthPlugin::d_setParameterValue(uint32_t index, float value) } } -void ZamSynthPlugin::d_setProgram(uint32_t index) +void ZamSynthPlugin::loadProgram(uint32_t index) { if (index != 0) return; @@ -134,17 +134,17 @@ void ZamSynthPlugin::d_setProgram(uint32_t index) curvoice = voice; //ptr to first voice for (int i = 0; i < AREAHEIGHT; i++) { - wave_y[i] = sin(i*2.*M_PI/d_getSampleRate());//*1000 + wave_y[i] = sin(i*2.*M_PI/getSampleRate());//*1000 } for (int i = 0; i < MAX_ENV; i++) { - env_y[i] = (sin(i*2.*M_PI/d_getSampleRate()*1000./2.)) > 0.f ? sin(i*2.*M_PI/d_getSampleRate()*1000./2.) : 0.f; + env_y[i] = (sin(i*2.*M_PI/getSampleRate()*1000./2.)) > 0.f ? sin(i*2.*M_PI/d_getSampleRate()*1000./2.) : 0.f; } /* reset filter values */ - d_activate(); + activate(); } -void ZamSynthPlugin::d_setState(const char* key, const char* value) +void ZamSynthPlugin::setState(const char* key, const char* value) { if (strcmp(key, "waveform") == 0) { char* tmp; @@ -173,7 +173,7 @@ void ZamSynthPlugin::d_setState(const char* key, const char* value) } } -void ZamSynthPlugin::d_initStateKey(unsigned int index, d_string& key) +void ZamSynthPlugin::initStateKey(unsigned int index, String& key) { if (index == 0) key = "waveform"; if (index == 1) key = "envelope"; @@ -182,7 +182,7 @@ void ZamSynthPlugin::d_initStateKey(unsigned int index, d_string& key) // ----------------------------------------------------------------------- // Process -void ZamSynthPlugin::d_activate() +void ZamSynthPlugin::activate() { } @@ -193,10 +193,10 @@ float ZamSynthPlugin::wavetable(float in) //return (sin(in)); } -void ZamSynthPlugin::d_run(const float**, float** outputs, uint32_t frames, +void ZamSynthPlugin::run(const float**, float** outputs, uint32_t frames, const MidiEvent* midievent, uint32_t midicount) { - float srate = d_getSampleRate(); + float srate = getSampleRate(); int slowfactor = (int) srate / (speed * 2400); // 1-20 ~ 20-1 uint32_t i; float RD_0; diff --git a/plugins/ZamSynth/ZamSynthPlugin.hpp b/plugins/ZamSynth/ZamSynthPlugin.hpp index dfcb044..cefc33f 100644 --- a/plugins/ZamSynth/ZamSynthPlugin.hpp +++ b/plugins/ZamSynth/ZamSynthPlugin.hpp @@ -45,27 +45,27 @@ protected: // ------------------------------------------------------------------- // Information - const char* d_getLabel() const noexcept override + const char* getLabel() const noexcept override { return "ZamSynth"; } - const char* d_getMaker() const noexcept override + const char* getMaker() const noexcept override { return "Damien Zammit"; } - const char* d_getLicense() const noexcept override + const char* getLicense() const noexcept override { return "GPL v2+"; } - uint32_t d_getVersion() const noexcept override + uint32_t getVersion() const noexcept override { return 0x1000; } - int64_t d_getUniqueId() const noexcept override + int64_t getUniqueId() const noexcept override { return d_cconst('Z', 'S', 'T', 'H'); } @@ -73,15 +73,15 @@ protected: // ------------------------------------------------------------------- // Init - void d_initParameter(uint32_t index, Parameter& parameter) ; - void d_initProgramName(uint32_t index, d_string& programName) ; + void initParameter(uint32_t index, Parameter& parameter) ; + void initProgramName(uint32_t index, String& programName) ; // ------------------------------------------------------------------- // Internal data - float d_getParameterValue(uint32_t index) const override; - void d_setParameterValue(uint32_t index, float value) override; - void d_setProgram(uint32_t index) ; + float getParameterValue(uint32_t index) const override; + void setParameterValue(uint32_t index, float value) override; + void loadProgram(uint32_t index) override; // ------------------------------------------------------------------- // Process @@ -104,11 +104,11 @@ protected: } float wavetable(float in); - void d_activate() override; - void d_run(const float** inputs, float** outputs, uint32_t frames, + void activate() override; + void run(const float** inputs, float** outputs, uint32_t frames, const MidiEvent* midievent, uint32_t midicount) override; - void d_setState(const char* key, const char* value) override; - void d_initStateKey(unsigned int key, d_string& val) override; + void setState(const char* key, const char* value) override; + void initStateKey(unsigned int key, String& val) override; // ------------------------------------------------------------------- private: diff --git a/plugins/ZamSynth/ZamSynthUI.cpp b/plugins/ZamSynth/ZamSynthUI.cpp index 92233be..6933d5d 100644 --- a/plugins/ZamSynth/ZamSynthUI.cpp +++ b/plugins/ZamSynth/ZamSynthUI.cpp @@ -79,10 +79,10 @@ ZamSynthUI::ZamSynthUI() fToggleGraph->setValue(0.f); // set default values - d_programChanged(0); + programLoaded(0); } -void ZamSynthUI::d_stateChanged(const char* key, const char* value) +void ZamSynthUI::stateChanged(const char* key, const char* value) { if (strcmp(key, "waveform") == 0) { char* tmp; @@ -114,7 +114,7 @@ void ZamSynthUI::d_stateChanged(const char* key, const char* value) // ----------------------------------------------------------------------- // DSP Callbacks -void ZamSynthUI::d_parameterChanged(uint32_t index, float value) +void ZamSynthUI::parameterChanged(uint32_t index, float value) { switch (index) { @@ -130,7 +130,7 @@ void ZamSynthUI::d_parameterChanged(uint32_t index, float value) } } -void ZamSynthUI::d_programChanged(uint32_t index) +void ZamSynthUI::programLoaded(uint32_t index) { if (index != 0) return; @@ -145,25 +145,25 @@ void ZamSynthUI::d_programChanged(uint32_t index) void ZamSynthUI::imageKnobDragStarted(ImageKnob* knob) { if (knob == fKnobGain) - d_editParameter(ZamSynthPlugin::paramGain, true); + editParameter(ZamSynthPlugin::paramGain, true); else if (knob == fKnobSpeed) - d_editParameter(ZamSynthPlugin::paramSpeed, true); + editParameter(ZamSynthPlugin::paramSpeed, true); } void ZamSynthUI::imageKnobDragFinished(ImageKnob* knob) { if (knob == fKnobGain) - d_editParameter(ZamSynthPlugin::paramGain, false); + editParameter(ZamSynthPlugin::paramGain, false); else if (knob == fKnobSpeed) - d_editParameter(ZamSynthPlugin::paramSpeed, false); + editParameter(ZamSynthPlugin::paramSpeed, false); } void ZamSynthUI::imageKnobValueChanged(ImageKnob* knob, float value) { if (knob == fKnobGain) - d_setParameterValue(ZamSynthPlugin::paramGain, value); + setParameterValue(ZamSynthPlugin::paramGain, value); else if (knob == fKnobSpeed) - d_setParameterValue(ZamSynthPlugin::paramSpeed, value); + setParameterValue(ZamSynthPlugin::paramSpeed, value); } void ZamSynthUI::imageButtonClicked(ImageButton*, int) @@ -189,16 +189,16 @@ void ZamSynthUI::imageButtonClicked(ImageButton*, int) } if (fToggleGraph->getValue() == 1.f) - d_setState("envelope", tmp); + setState("envelope", tmp); else - d_setState("waveform", tmp); + setState("waveform", tmp); } void ZamSynthUI::imageToggleClicked(ImageToggle*, int) { float toggle = fToggleGraph->getValue(); fToggleGraph->setValue(toggle); - d_setParameterValue(ZamSynthPlugin::paramGraph, toggle); + setParameterValue(ZamSynthPlugin::paramGraph, toggle); } void ZamSynthUI::gaussiansmooth(float* smoothed, float* xs, float* ys, int n, int radius) @@ -284,9 +284,9 @@ bool ZamSynthUI::onMotion(const MotionEvent& ev) gr[x-10] = y-10; if (gr == env_y) - d_setState("envelope",tmp); + setState("envelope",tmp); else - d_setState("waveform",tmp); + setState("waveform",tmp); repaint(); } diff --git a/plugins/ZamSynth/ZamSynthUI.hpp b/plugins/ZamSynth/ZamSynthUI.hpp index 291990f..dcae528 100644 --- a/plugins/ZamSynth/ZamSynthUI.hpp +++ b/plugins/ZamSynth/ZamSynthUI.hpp @@ -64,9 +64,9 @@ protected: // ------------------------------------------------------------------- // DSP Callbacks - void d_parameterChanged(uint32_t index, float value) override; - void d_programChanged(uint32_t index) override; - void d_stateChanged(const char*, const char*) override; + void parameterChanged(uint32_t index, float value) override; + void programLoaded(uint32_t index) override; + void stateChanged(const char*, const char*) override; // ------------------------------------------------------------------- // Widget Callbacks diff --git a/plugins/ZamTube/ZamTubePlugin.cpp b/plugins/ZamTube/ZamTubePlugin.cpp index 6b829e3..e4aa101 100644 --- a/plugins/ZamTube/ZamTubePlugin.cpp +++ b/plugins/ZamTube/ZamTubePlugin.cpp @@ -32,13 +32,13 @@ ZamTubePlugin::ZamTubePlugin() I1(&S1), I3(&Ck,&Rk), S2(&Co,&Ro), I4(&S2), P2(&I4,&E) { // set default values - d_setProgram(0); + loadProgram(0); } // ----------------------------------------------------------------------- // Init -void ZamTubePlugin::d_initParameter(uint32_t index, Parameter& parameter) +void ZamTubePlugin::initParameter(uint32_t index, Parameter& parameter) { switch (index) { @@ -108,7 +108,7 @@ void ZamTubePlugin::d_initParameter(uint32_t index, Parameter& parameter) } } -void ZamTubePlugin::d_initProgramName(uint32_t index, d_string& programName) +void ZamTubePlugin::initProgramName(uint32_t index, String& programName) { if (index != 0) return; @@ -119,7 +119,7 @@ void ZamTubePlugin::d_initProgramName(uint32_t index, d_string& programName) // ----------------------------------------------------------------------- // Internal data -float ZamTubePlugin::d_getParameterValue(uint32_t index) const +float ZamTubePlugin::getParameterValue(uint32_t index) const { switch (index) { @@ -149,7 +149,7 @@ float ZamTubePlugin::d_getParameterValue(uint32_t index) const } } -void ZamTubePlugin::d_setParameterValue(uint32_t index, float value) +void ZamTubePlugin::setParameterValue(uint32_t index, float value) { switch (index) { @@ -177,7 +177,7 @@ void ZamTubePlugin::d_setParameterValue(uint32_t index, float value) } } -void ZamTubePlugin::d_setProgram(uint32_t index) +void ZamTubePlugin::loadProgram(uint32_t index) { if (index != 0) return; @@ -194,16 +194,16 @@ void ZamTubePlugin::d_setProgram(uint32_t index) /* Default variable values */ /* reset filter values */ - d_activate(); + activate(); } // ----------------------------------------------------------------------- // Process -void ZamTubePlugin::d_activate() +void ZamTubePlugin::activate() { - T Fs = d_getSampleRate(); + T Fs = getSampleRate(); // Passive components T ci = 0.0000001; //100nF @@ -297,7 +297,7 @@ void ZamTubePlugin::d_activate() for (int i=0; i<4; i++) fRec24[i] = 0; } -void ZamTubePlugin::d_run(const float** inputs, float** outputs, uint32_t frames) +void ZamTubePlugin::run(const float** inputs, float** outputs, uint32_t frames) { T tubetone = 0.f; diff --git a/plugins/ZamTube/ZamTubePlugin.hpp b/plugins/ZamTube/ZamTubePlugin.hpp index 4a23b59..6e12d82 100644 --- a/plugins/ZamTube/ZamTubePlugin.hpp +++ b/plugins/ZamTube/ZamTubePlugin.hpp @@ -121,27 +121,27 @@ protected: // ------------------------------------------------------------------- // Information - const char* d_getLabel() const noexcept override + const char* getLabel() const noexcept override { return "ZamTube"; } - const char* d_getMaker() const noexcept override + const char* getMaker() const noexcept override { return "Damien Zammit"; } - const char* d_getLicense() const noexcept override + const char* getLicense() const noexcept override { return "GPL v2+"; } - uint32_t d_getVersion() const noexcept override + uint32_t getVersion() const noexcept override { return 0x1500; } - int64_t d_getUniqueId() const noexcept override + int64_t getUniqueId() const noexcept override { return d_cconst('Z', 'T', 'U', 'B'); } @@ -149,15 +149,15 @@ protected: // ------------------------------------------------------------------- // Init - void d_initParameter(uint32_t index, Parameter& parameter) ; - void d_initProgramName(uint32_t index, d_string& programName) ; + void initParameter(uint32_t index, Parameter& parameter) ; + void initProgramName(uint32_t index, String& programName) ; // ------------------------------------------------------------------- // Internal data - float d_getParameterValue(uint32_t index) const override; - void d_setParameterValue(uint32_t index, float value) override; - void d_setProgram(uint32_t index) ; + float getParameterValue(uint32_t index) const override; + void setParameterValue(uint32_t index, float value) override; + void loadProgram(uint32_t index) override; // ------------------------------------------------------------------- // Process @@ -179,8 +179,8 @@ protected: return (20.f*log10(g)); } - void d_activate() override; - void d_run(const float** inputs, float** outputs, uint32_t frames) override; + void activate() override; + void run(const float** inputs, float** outputs, uint32_t frames) override; // ------------------------------------------------------------------- diff --git a/plugins/ZamTube/ZamTubeUI.cpp b/plugins/ZamTube/ZamTubeUI.cpp index f999e66..50fc349 100644 --- a/plugins/ZamTube/ZamTubeUI.cpp +++ b/plugins/ZamTube/ZamTubeUI.cpp @@ -107,13 +107,13 @@ ZamTubeUI::ZamTubeUI() fToggleInsane->setCallback(this); // set default values - d_programChanged(0); + programLoaded(0); } // ----------------------------------------------------------------------- // DSP Callbacks -void ZamTubeUI::d_parameterChanged(uint32_t index, float value) +void ZamTubeUI::parameterChanged(uint32_t index, float value) { switch (index) { @@ -138,7 +138,7 @@ void ZamTubeUI::d_parameterChanged(uint32_t index, float value) } } -void ZamTubeUI::d_programChanged(uint32_t index) +void ZamTubeUI::programLoaded(uint32_t index) { if (index != 0) return; @@ -159,65 +159,65 @@ void ZamTubeUI::d_programChanged(uint32_t index) void ZamTubeUI::imageKnobDragStarted(ImageKnob* knob) { if (knob == fKnobTube) - d_editParameter(ZamTubePlugin::paramTubedrive, true); + editParameter(ZamTubePlugin::paramTubedrive, true); else if (knob == fKnobBass) - d_editParameter(ZamTubePlugin::paramBass, true); + editParameter(ZamTubePlugin::paramBass, true); else if (knob == fKnobMids) - d_editParameter(ZamTubePlugin::paramMiddle, true); + editParameter(ZamTubePlugin::paramMiddle, true); else if (knob == fKnobTreb) - d_editParameter(ZamTubePlugin::paramTreble, true); + editParameter(ZamTubePlugin::paramTreble, true); else if (knob == fKnobGain) - d_editParameter(ZamTubePlugin::paramGain, true); + editParameter(ZamTubePlugin::paramGain, true); } void ZamTubeUI::imageKnobDragFinished(ImageKnob* knob) { if (knob == fKnobTube) - d_editParameter(ZamTubePlugin::paramTubedrive, false); + editParameter(ZamTubePlugin::paramTubedrive, false); else if (knob == fKnobBass) - d_editParameter(ZamTubePlugin::paramBass, false); + editParameter(ZamTubePlugin::paramBass, false); else if (knob == fKnobMids) - d_editParameter(ZamTubePlugin::paramMiddle, false); + editParameter(ZamTubePlugin::paramMiddle, false); else if (knob == fKnobTreb) - d_editParameter(ZamTubePlugin::paramTreble, false); + editParameter(ZamTubePlugin::paramTreble, false); else if (knob == fKnobGain) - d_editParameter(ZamTubePlugin::paramGain, false); + editParameter(ZamTubePlugin::paramGain, false); } void ZamTubeUI::imageKnobValueChanged(ImageKnob* knob, float value) { if (knob == fKnobTube) - d_setParameterValue(ZamTubePlugin::paramTubedrive, value); + setParameterValue(ZamTubePlugin::paramTubedrive, value); else if (knob == fKnobBass) - d_setParameterValue(ZamTubePlugin::paramBass, value); + setParameterValue(ZamTubePlugin::paramBass, value); else if (knob == fKnobMids) - d_setParameterValue(ZamTubePlugin::paramMiddle, value); + setParameterValue(ZamTubePlugin::paramMiddle, value); else if (knob == fKnobTreb) - d_setParameterValue(ZamTubePlugin::paramTreble, value); + setParameterValue(ZamTubePlugin::paramTreble, value); else if (knob == fKnobGain) - d_setParameterValue(ZamTubePlugin::paramGain, value); + setParameterValue(ZamTubePlugin::paramGain, value); } void ZamTubeUI::imageSliderDragStarted(ImageSlider*) { - d_editParameter(ZamTubePlugin::paramToneStack, true); + editParameter(ZamTubePlugin::paramToneStack, true); } void ZamTubeUI::imageSliderDragFinished(ImageSlider*) { - d_editParameter(ZamTubePlugin::paramToneStack, false); + editParameter(ZamTubePlugin::paramToneStack, false); } void ZamTubeUI::imageSliderValueChanged(ImageSlider*, float value) { - d_setParameterValue(ZamTubePlugin::paramToneStack, value); + setParameterValue(ZamTubePlugin::paramToneStack, value); } void ZamTubeUI::imageToggleClicked(ImageToggle* toggle, int) { float v = toggle->getValue(); if (toggle == fToggleInsane) { - d_setParameterValue(ZamTubePlugin::paramInsane, v); + setParameterValue(ZamTubePlugin::paramInsane, v); } } diff --git a/plugins/ZamTube/ZamTubeUI.hpp b/plugins/ZamTube/ZamTubeUI.hpp index f76eb4e..c4f6b12 100644 --- a/plugins/ZamTube/ZamTubeUI.hpp +++ b/plugins/ZamTube/ZamTubeUI.hpp @@ -47,8 +47,8 @@ protected: // ------------------------------------------------------------------- // DSP Callbacks - void d_parameterChanged(uint32_t index, float value) ; - void d_programChanged(uint32_t index) ; + void parameterChanged(uint32_t index, float value) override; + void programLoaded(uint32_t index) override; // ------------------------------------------------------------------- // Widget Callbacks |