summaryrefslogtreecommitdiff
path: root/plugins/ZamEQ2
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/ZamEQ2')
-rw-r--r--plugins/ZamEQ2/ZamEQ2Plugin.cpp27
-rw-r--r--plugins/ZamEQ2/ZamEQ2Plugin.hpp26
-rw-r--r--plugins/ZamEQ2/ZamEQ2UI.cpp74
-rw-r--r--plugins/ZamEQ2/ZamEQ2UI.hpp4
4 files changed, 61 insertions, 70 deletions
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
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-28 12:14:16 +0000