Update all other plugins to new DPF

4 files changed, 31 insertions, 40 deletions

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