diff options
author | falkTX <falktx@gmail.com> | 2015-06-13 17:17:20 +0200 |
---|---|---|
committer | falkTX <falktx@gmail.com> | 2015-06-13 17:17:20 +0200 |
commit | 7a3210e063620e54ca6f2dbef6c49188a6fd0a88 (patch) | |
tree | c094db906b8e1d52c552cb0158a82ce58272508f | |
parent | f90ae6effcc933e55afebf601ea8f876598e69a2 (diff) |
Update ZamComp to new DPF
-rw-r--r-- | plugins/ZamComp/ZamCompPlugin.cpp | 27 | ||||
-rw-r--r-- | plugins/ZamComp/ZamCompPlugin.hpp | 25 | ||||
-rw-r--r-- | plugins/ZamComp/ZamCompUI.cpp | 12 | ||||
-rw-r--r-- | plugins/ZamComp/ZamCompUI.hpp | 4 |
4 files changed, 30 insertions, 38 deletions
diff --git a/plugins/ZamComp/ZamCompPlugin.cpp b/plugins/ZamComp/ZamCompPlugin.cpp index 93bea2d..3c125e3 100644 --- a/plugins/ZamComp/ZamCompPlugin.cpp +++ b/plugins/ZamComp/ZamCompPlugin.cpp @@ -25,13 +25,13 @@ ZamCompPlugin::ZamCompPlugin() : Plugin(paramCount, 3, 0) { // set default values - d_setProgram(0); + loadProgram(0); } // ----------------------------------------------------------------------- // Init -void ZamCompPlugin::d_initParameter(uint32_t index, Parameter& parameter) +void ZamCompPlugin::initParameter(uint32_t index, Parameter& parameter) { switch (index) { @@ -110,7 +110,7 @@ void ZamCompPlugin::d_initParameter(uint32_t index, Parameter& parameter) } } -void ZamCompPlugin::d_initProgramName(uint32_t index, d_string& programName) +void ZamCompPlugin::initProgramName(uint32_t index, String& programName) { switch(index) { case 0: @@ -159,12 +159,14 @@ void ZamCompPlugin::loadProgram(uint32_t index) outlevel = -45.0; break; } + /* reset filter values */ + activate(); } // ----------------------------------------------------------------------- // Internal data -float ZamCompPlugin::d_getParameterValue(uint32_t index) const +float ZamCompPlugin::getParameterValue(uint32_t index) const { switch (index) { case paramAttack: @@ -196,7 +198,7 @@ float ZamCompPlugin::d_getParameterValue(uint32_t index) const } } -void ZamCompPlugin::d_setParameterValue(uint32_t index, float value) +void ZamCompPlugin::setParameterValue(uint32_t index, float value) { switch (index) { case paramAttack: @@ -226,28 +228,19 @@ void ZamCompPlugin::d_setParameterValue(uint32_t index, float value) } } -void ZamCompPlugin::d_setProgram(uint32_t index) -{ - /* Default parameter values */ - loadProgram(index); - - /* reset filter values */ - d_activate(); -} - // ----------------------------------------------------------------------- // Process -void ZamCompPlugin::d_activate() +void ZamCompPlugin::activate() { gainr = 0.0f; outlevel = -45.f; old_yl = old_y1 = old_yg = 0.0f; } -void ZamCompPlugin::d_run(const float** inputs, float** outputs, uint32_t frames) +void ZamCompPlugin::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/ZamComp/ZamCompPlugin.hpp b/plugins/ZamComp/ZamCompPlugin.hpp index acbaf98..a1698b0 100644 --- a/plugins/ZamComp/ZamCompPlugin.hpp +++ b/plugins/ZamComp/ZamCompPlugin.hpp @@ -46,27 +46,27 @@ protected: // ------------------------------------------------------------------- // Information - const char* d_getLabel() const noexcept override + const char* getLabel() const noexcept override { return "ZamComp"; } - 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', 'M', 'P'); } @@ -74,16 +74,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 @@ -105,8 +104,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/ZamComp/ZamCompUI.cpp b/plugins/ZamComp/ZamCompUI.cpp index c7385ed..9cbdcca 100644 --- a/plugins/ZamComp/ZamCompUI.cpp +++ b/plugins/ZamComp/ZamCompUI.cpp @@ -98,13 +98,13 @@ ZamCompUI::ZamCompUI() fKnobMakeup->setCallback(this); // set default values - d_programChanged(0); + programLoaded(0); } // ----------------------------------------------------------------------- // DSP Callbacks -void ZamCompUI::d_parameterChanged(uint32_t index, float value) +void ZamCompUI::parameterChanged(uint32_t index, float value) { switch (index) { @@ -143,7 +143,7 @@ void ZamCompUI::d_parameterChanged(uint32_t index, float value) } } -void ZamCompUI::d_programChanged(uint32_t index) +void ZamCompUI::programLoaded(uint32_t index) { if (index != 0) return; @@ -162,17 +162,17 @@ void ZamCompUI::d_programChanged(uint32_t index) void ZamCompUI::imageKnobDragStarted(ImageKnob* knob) { - d_editParameter(knob->getId(), true); + editParameter(knob->getId(), true); } void ZamCompUI::imageKnobDragFinished(ImageKnob* knob) { - d_editParameter(knob->getId(), false); + editParameter(knob->getId(), false); } void ZamCompUI::imageKnobValueChanged(ImageKnob* knob, float value) { - d_setParameterValue(knob->getId(), value); + setParameterValue(knob->getId(), value); } void ZamCompUI::onDisplay() diff --git a/plugins/ZamComp/ZamCompUI.hpp b/plugins/ZamComp/ZamCompUI.hpp index a4ee620..08f880c 100644 --- a/plugins/ZamComp/ZamCompUI.hpp +++ b/plugins/ZamComp/ZamCompUI.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 |