From 1741a5012710ccd75f01db3019b42fcc8dff60ab Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 26 Apr 2015 20:10:54 +0200 Subject: [PATCH] Update to latest dpf --- dpf | 2 +- plugins/3BandEQ/DistrhoPlugin3BandEQ.cpp | 30 +++++++++---------- plugins/3BandEQ/DistrhoPlugin3BandEQ.hpp | 26 ++++++++-------- plugins/3BandEQ/DistrhoUI3BandEQ.cpp | 18 +++++------ plugins/3BandEQ/DistrhoUI3BandEQ.hpp | 4 +-- .../DistrhoPlugin3BandSplitter.cpp | 30 +++++++++---------- .../DistrhoPlugin3BandSplitter.hpp | 26 ++++++++-------- .../3BandSplitter/DistrhoUI3BandSplitter.cpp | 18 +++++------ .../3BandSplitter/DistrhoUI3BandSplitter.hpp | 4 +-- .../PingPongPan/DistrhoPluginPingPongPan.cpp | 28 ++++++++--------- .../PingPongPan/DistrhoPluginPingPongPan.hpp | 26 ++++++++-------- plugins/PingPongPan/DistrhoUIPingPongPan.cpp | 12 ++++---- plugins/PingPongPan/DistrhoUIPingPongPan.hpp | 4 +-- 13 files changed, 114 insertions(+), 114 deletions(-) diff --git a/dpf b/dpf index 48041c9..2a66f39 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 48041c91b7b016e17da84c404609b80b444fb2ba +Subproject commit 2a66f39cdf7b5e28d3cc61da78879fac47d4e9fc diff --git a/plugins/3BandEQ/DistrhoPlugin3BandEQ.cpp b/plugins/3BandEQ/DistrhoPlugin3BandEQ.cpp index 4a630c2..bda4c28 100644 --- a/plugins/3BandEQ/DistrhoPlugin3BandEQ.cpp +++ b/plugins/3BandEQ/DistrhoPlugin3BandEQ.cpp @@ -31,16 +31,16 @@ DistrhoPlugin3BandEQ::DistrhoPlugin3BandEQ() : Plugin(paramCount, 1, 0) // 1 program, 0 states { // set default values - d_setProgram(0); + loadProgram(0); // reset - d_deactivate(); + deactivate(); } // ----------------------------------------------------------------------- // Init -void DistrhoPlugin3BandEQ::d_initParameter(uint32_t index, Parameter& parameter) +void DistrhoPlugin3BandEQ::initParameter(uint32_t index, Parameter& parameter) { switch (index) { @@ -106,7 +106,7 @@ void DistrhoPlugin3BandEQ::d_initParameter(uint32_t index, Parameter& parameter) } } -void DistrhoPlugin3BandEQ::d_initProgramName(uint32_t index, d_string& programName) +void DistrhoPlugin3BandEQ::initProgramName(uint32_t index, String& programName) { if (index != 0) return; @@ -117,7 +117,7 @@ void DistrhoPlugin3BandEQ::d_initProgramName(uint32_t index, d_string& programNa // ----------------------------------------------------------------------- // Internal data -float DistrhoPlugin3BandEQ::d_getParameterValue(uint32_t index) const +float DistrhoPlugin3BandEQ::getParameterValue(uint32_t index) const { switch (index) { @@ -138,9 +138,9 @@ float DistrhoPlugin3BandEQ::d_getParameterValue(uint32_t index) const } } -void DistrhoPlugin3BandEQ::d_setParameterValue(uint32_t index, float value) +void DistrhoPlugin3BandEQ::setParameterValue(uint32_t index, float value) { - if (d_getSampleRate() <= 0.0) + if (getSampleRate() <= 0.0) return; switch (index) @@ -164,21 +164,21 @@ void DistrhoPlugin3BandEQ::d_setParameterValue(uint32_t index, float value) case paramLowMidFreq: fLowMidFreq = std::fmin(value, fMidHighFreq); freqLP = fLowMidFreq; - xLP = std::exp(-2.0f * kPI * freqLP / (float)d_getSampleRate()); + xLP = std::exp(-2.0f * kPI * freqLP / (float)getSampleRate()); a0LP = 1.0f - xLP; b1LP = -xLP; break; case paramMidHighFreq: fMidHighFreq = std::fmax(value, fLowMidFreq); freqHP = fMidHighFreq; - xHP = std::exp(-2.0f * kPI * freqHP / (float)d_getSampleRate()); + xHP = std::exp(-2.0f * kPI * freqHP / (float)getSampleRate()); a0HP = 1.0f - xHP; b1HP = -xHP; break; } } -void DistrhoPlugin3BandEQ::d_setProgram(uint32_t index) +void DistrhoPlugin3BandEQ::loadProgram(uint32_t index) { if (index != 0) return; @@ -197,15 +197,15 @@ void DistrhoPlugin3BandEQ::d_setProgram(uint32_t index) freqHP = 2000.0f; // reset filter values - d_activate(); + activate(); } // ----------------------------------------------------------------------- // Process -void DistrhoPlugin3BandEQ::d_activate() +void DistrhoPlugin3BandEQ::activate() { - const float sr = (float)d_getSampleRate(); + const float sr = (float)getSampleRate(); xLP = std::exp(-2.0f * kPI * freqLP / sr); @@ -222,13 +222,13 @@ void DistrhoPlugin3BandEQ::d_activate() b1HP = -xHP; } -void DistrhoPlugin3BandEQ::d_deactivate() +void DistrhoPlugin3BandEQ::deactivate() { out1LP = out2LP = out1HP = out2HP = 0.0f; tmp1LP = tmp2LP = tmp1HP = tmp2HP = 0.0f; } -void DistrhoPlugin3BandEQ::d_run(const float** inputs, float** outputs, uint32_t frames) +void DistrhoPlugin3BandEQ::run(const float** inputs, float** outputs, uint32_t frames) { const float* in1 = inputs[0]; const float* in2 = inputs[1]; diff --git a/plugins/3BandEQ/DistrhoPlugin3BandEQ.hpp b/plugins/3BandEQ/DistrhoPlugin3BandEQ.hpp index 5296104..0266d58 100644 --- a/plugins/3BandEQ/DistrhoPlugin3BandEQ.hpp +++ b/plugins/3BandEQ/DistrhoPlugin3BandEQ.hpp @@ -44,27 +44,27 @@ protected: // ------------------------------------------------------------------- // Information - const char* d_getLabel() const noexcept override + const char* getLabel() const noexcept override { return "3BandEQ"; } - const char* d_getMaker() const noexcept override + const char* getMaker() const noexcept override { return "DISTRHO"; } - const char* d_getLicense() const noexcept override + const char* getLicense() const noexcept override { return "LGPL"; } - 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('D', '3', 'E', 'Q'); } @@ -72,22 +72,22 @@ 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 - void d_activate() override; - void d_deactivate() override; - 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/3BandEQ/DistrhoUI3BandEQ.cpp b/plugins/3BandEQ/DistrhoUI3BandEQ.cpp index 9f9621c..03ccd70 100644 --- a/plugins/3BandEQ/DistrhoUI3BandEQ.cpp +++ b/plugins/3BandEQ/DistrhoUI3BandEQ.cpp @@ -101,13 +101,13 @@ DistrhoUI3BandEQ::DistrhoUI3BandEQ() fButtonAbout->setCallback(this); // set default values - d_programChanged(0); + programLoaded(0); } // ----------------------------------------------------------------------- // DSP Callbacks -void DistrhoUI3BandEQ::d_parameterChanged(uint32_t index, float value) +void DistrhoUI3BandEQ::parameterChanged(uint32_t index, float value) { switch (index) { @@ -132,7 +132,7 @@ void DistrhoUI3BandEQ::d_parameterChanged(uint32_t index, float value) } } -void DistrhoUI3BandEQ::d_programChanged(uint32_t index) +void DistrhoUI3BandEQ::programLoaded(uint32_t index) { if (index != 0) return; @@ -159,32 +159,32 @@ void DistrhoUI3BandEQ::imageButtonClicked(ImageButton* button, int) void DistrhoUI3BandEQ::imageKnobDragStarted(ImageKnob* knob) { - d_editParameter(knob->getId(), true); + editParameter(knob->getId(), true); } void DistrhoUI3BandEQ::imageKnobDragFinished(ImageKnob* knob) { - d_editParameter(knob->getId(), false); + editParameter(knob->getId(), false); } void DistrhoUI3BandEQ::imageKnobValueChanged(ImageKnob* knob, float value) { - d_setParameterValue(knob->getId(), value); + setParameterValue(knob->getId(), value); } void DistrhoUI3BandEQ::imageSliderDragStarted(ImageSlider* slider) { - d_editParameter(slider->getId(), true); + editParameter(slider->getId(), true); } void DistrhoUI3BandEQ::imageSliderDragFinished(ImageSlider* slider) { - d_editParameter(slider->getId(), false); + editParameter(slider->getId(), false); } void DistrhoUI3BandEQ::imageSliderValueChanged(ImageSlider* slider, float value) { - d_setParameterValue(slider->getId(), value); + setParameterValue(slider->getId(), value); } void DistrhoUI3BandEQ::onDisplay() diff --git a/plugins/3BandEQ/DistrhoUI3BandEQ.hpp b/plugins/3BandEQ/DistrhoUI3BandEQ.hpp index 053f048..e2f01b0 100644 --- a/plugins/3BandEQ/DistrhoUI3BandEQ.hpp +++ b/plugins/3BandEQ/DistrhoUI3BandEQ.hpp @@ -48,8 +48,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/3BandSplitter/DistrhoPlugin3BandSplitter.cpp b/plugins/3BandSplitter/DistrhoPlugin3BandSplitter.cpp index 796edaa..22c42d8 100644 --- a/plugins/3BandSplitter/DistrhoPlugin3BandSplitter.cpp +++ b/plugins/3BandSplitter/DistrhoPlugin3BandSplitter.cpp @@ -31,16 +31,16 @@ DistrhoPlugin3BandSplitter::DistrhoPlugin3BandSplitter() : Plugin(paramCount, 1, 0) // 1 program, 0 states { // set default values - d_setProgram(0); + loadProgram(0); // reset - d_deactivate(); + deactivate(); } // ----------------------------------------------------------------------- // Init -void DistrhoPlugin3BandSplitter::d_initParameter(uint32_t index, Parameter& parameter) +void DistrhoPlugin3BandSplitter::initParameter(uint32_t index, Parameter& parameter) { switch (index) { @@ -106,7 +106,7 @@ void DistrhoPlugin3BandSplitter::d_initParameter(uint32_t index, Parameter& para } } -void DistrhoPlugin3BandSplitter::d_initProgramName(uint32_t index, d_string& programName) +void DistrhoPlugin3BandSplitter::initProgramName(uint32_t index, String& programName) { if (index != 0) return; @@ -117,7 +117,7 @@ void DistrhoPlugin3BandSplitter::d_initProgramName(uint32_t index, d_string& pro // ----------------------------------------------------------------------- // Internal data -float DistrhoPlugin3BandSplitter::d_getParameterValue(uint32_t index) const +float DistrhoPlugin3BandSplitter::getParameterValue(uint32_t index) const { switch (index) { @@ -138,9 +138,9 @@ float DistrhoPlugin3BandSplitter::d_getParameterValue(uint32_t index) const } } -void DistrhoPlugin3BandSplitter::d_setParameterValue(uint32_t index, float value) +void DistrhoPlugin3BandSplitter::setParameterValue(uint32_t index, float value) { - if (d_getSampleRate() <= 0.0) + if (getSampleRate() <= 0.0) return; switch (index) @@ -164,21 +164,21 @@ void DistrhoPlugin3BandSplitter::d_setParameterValue(uint32_t index, float value case paramLowMidFreq: fLowMidFreq = std::fmin(value, fMidHighFreq); freqLP = fLowMidFreq; - xLP = std::exp(-2.0f * kPI * freqLP / (float)d_getSampleRate()); + xLP = std::exp(-2.0f * kPI * freqLP / (float)getSampleRate()); a0LP = 1.0f - xLP; b1LP = -xLP; break; case paramMidHighFreq: fMidHighFreq = std::fmax(value, fLowMidFreq); freqHP = fMidHighFreq; - xHP = std::exp(-2.0f * kPI * freqHP / (float)d_getSampleRate()); + xHP = std::exp(-2.0f * kPI * freqHP / (float)getSampleRate()); a0HP = 1.0f - xHP; b1HP = -xHP; break; } } -void DistrhoPlugin3BandSplitter::d_setProgram(uint32_t index) +void DistrhoPlugin3BandSplitter::loadProgram(uint32_t index) { if (index != 0) return; @@ -197,15 +197,15 @@ void DistrhoPlugin3BandSplitter::d_setProgram(uint32_t index) freqHP = 2000.0f; // reset filter values - d_activate(); + activate(); } // ----------------------------------------------------------------------- // Process -void DistrhoPlugin3BandSplitter::d_activate() +void DistrhoPlugin3BandSplitter::activate() { - const float sr = (float)d_getSampleRate(); + const float sr = (float)getSampleRate(); xLP = std::exp(-2.0f * kPI * freqLP / sr); @@ -222,13 +222,13 @@ void DistrhoPlugin3BandSplitter::d_activate() b1HP = -xHP; } -void DistrhoPlugin3BandSplitter::d_deactivate() +void DistrhoPlugin3BandSplitter::deactivate() { out1LP = out2LP = out1HP = out2HP = 0.0f; tmp1LP = tmp2LP = tmp1HP = tmp2HP = 0.0f; } -void DistrhoPlugin3BandSplitter::d_run(const float** inputs, float** outputs, uint32_t frames) +void DistrhoPlugin3BandSplitter::run(const float** inputs, float** outputs, uint32_t frames) { const float* in1 = inputs[0]; const float* in2 = inputs[1]; diff --git a/plugins/3BandSplitter/DistrhoPlugin3BandSplitter.hpp b/plugins/3BandSplitter/DistrhoPlugin3BandSplitter.hpp index d853330..ad03cc0 100644 --- a/plugins/3BandSplitter/DistrhoPlugin3BandSplitter.hpp +++ b/plugins/3BandSplitter/DistrhoPlugin3BandSplitter.hpp @@ -44,27 +44,27 @@ protected: // ------------------------------------------------------------------- // Information - const char* d_getLabel() const noexcept override + const char* getLabel() const noexcept override { return "3BandSplitter"; } - const char* d_getMaker() const noexcept override + const char* getMaker() const noexcept override { return "DISTRHO"; } - const char* d_getLicense() const noexcept override + const char* getLicense() const noexcept override { return "LGPL"; } - 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('D', '3', 'E', 'S'); } @@ -72,22 +72,22 @@ 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 - void d_activate() override; - void d_deactivate() override; - 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/3BandSplitter/DistrhoUI3BandSplitter.cpp b/plugins/3BandSplitter/DistrhoUI3BandSplitter.cpp index 6efd63e..825232f 100644 --- a/plugins/3BandSplitter/DistrhoUI3BandSplitter.cpp +++ b/plugins/3BandSplitter/DistrhoUI3BandSplitter.cpp @@ -101,13 +101,13 @@ DistrhoUI3BandSplitter::DistrhoUI3BandSplitter() fButtonAbout->setCallback(this); // set default values - d_programChanged(0); + programLoaded(0); } // ----------------------------------------------------------------------- // DSP Callbacks -void DistrhoUI3BandSplitter::d_parameterChanged(uint32_t index, float value) +void DistrhoUI3BandSplitter::parameterChanged(uint32_t index, float value) { switch (index) { @@ -132,7 +132,7 @@ void DistrhoUI3BandSplitter::d_parameterChanged(uint32_t index, float value) } } -void DistrhoUI3BandSplitter::d_programChanged(uint32_t index) +void DistrhoUI3BandSplitter::programLoaded(uint32_t index) { if (index != 0) return; @@ -159,32 +159,32 @@ void DistrhoUI3BandSplitter::imageButtonClicked(ImageButton* button, int) void DistrhoUI3BandSplitter::imageKnobDragStarted(ImageKnob* knob) { - d_editParameter(knob->getId(), true); + editParameter(knob->getId(), true); } void DistrhoUI3BandSplitter::imageKnobDragFinished(ImageKnob* knob) { - d_editParameter(knob->getId(), false); + editParameter(knob->getId(), false); } void DistrhoUI3BandSplitter::imageKnobValueChanged(ImageKnob* knob, float value) { - d_setParameterValue(knob->getId(), value); + setParameterValue(knob->getId(), value); } void DistrhoUI3BandSplitter::imageSliderDragStarted(ImageSlider* slider) { - d_editParameter(slider->getId(), true); + editParameter(slider->getId(), true); } void DistrhoUI3BandSplitter::imageSliderDragFinished(ImageSlider* slider) { - d_editParameter(slider->getId(), false); + editParameter(slider->getId(), false); } void DistrhoUI3BandSplitter::imageSliderValueChanged(ImageSlider* slider, float value) { - d_setParameterValue(slider->getId(), value); + setParameterValue(slider->getId(), value); } void DistrhoUI3BandSplitter::onDisplay() diff --git a/plugins/3BandSplitter/DistrhoUI3BandSplitter.hpp b/plugins/3BandSplitter/DistrhoUI3BandSplitter.hpp index 53a1a6f..041a6cd 100644 --- a/plugins/3BandSplitter/DistrhoUI3BandSplitter.hpp +++ b/plugins/3BandSplitter/DistrhoUI3BandSplitter.hpp @@ -48,8 +48,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/PingPongPan/DistrhoPluginPingPongPan.cpp b/plugins/PingPongPan/DistrhoPluginPingPongPan.cpp index aa85022..7d75ed6 100644 --- a/plugins/PingPongPan/DistrhoPluginPingPongPan.cpp +++ b/plugins/PingPongPan/DistrhoPluginPingPongPan.cpp @@ -29,16 +29,16 @@ DistrhoPluginPingPongPan::DistrhoPluginPingPongPan() : Plugin(paramCount, 1, 0) // 1 program, 0 states { // set default values - d_setProgram(0); + loadProgram(0); // reset - d_deactivate(); + deactivate(); } // ----------------------------------------------------------------------- // Init -void DistrhoPluginPingPongPan::d_initParameter(uint32_t index, Parameter& parameter) +void DistrhoPluginPingPongPan::initParameter(uint32_t index, Parameter& parameter) { switch (index) { @@ -63,7 +63,7 @@ void DistrhoPluginPingPongPan::d_initParameter(uint32_t index, Parameter& parame } } -void DistrhoPluginPingPongPan::d_initProgramName(uint32_t index, d_string& programName) +void DistrhoPluginPingPongPan::initProgramName(uint32_t index, String& programName) { if (index != 0) return; @@ -74,7 +74,7 @@ void DistrhoPluginPingPongPan::d_initProgramName(uint32_t index, d_string& progr // ----------------------------------------------------------------------- // Internal data -float DistrhoPluginPingPongPan::d_getParameterValue(uint32_t index) const +float DistrhoPluginPingPongPan::getParameterValue(uint32_t index) const { switch (index) { @@ -87,16 +87,16 @@ float DistrhoPluginPingPongPan::d_getParameterValue(uint32_t index) const } } -void DistrhoPluginPingPongPan::d_setParameterValue(uint32_t index, float value) +void DistrhoPluginPingPongPan::setParameterValue(uint32_t index, float value) { - if (d_getSampleRate() <= 0.0) + if (getSampleRate() <= 0.0) return; switch (index) { case paramFreq: fFreq = value; - waveSpeed = (k2PI * fFreq / 100.0f)/(float)d_getSampleRate(); + waveSpeed = (k2PI * fFreq / 100.0f)/(float)getSampleRate(); break; case paramWidth: fWidth = value; @@ -104,7 +104,7 @@ void DistrhoPluginPingPongPan::d_setParameterValue(uint32_t index, float value) } } -void DistrhoPluginPingPongPan::d_setProgram(uint32_t index) +void DistrhoPluginPingPongPan::loadProgram(uint32_t index) { if (index != 0) return; @@ -114,23 +114,23 @@ void DistrhoPluginPingPongPan::d_setProgram(uint32_t index) fWidth = 75.0f; // reset filter values - d_activate(); + activate(); } // ----------------------------------------------------------------------- // Process -void DistrhoPluginPingPongPan::d_activate() +void DistrhoPluginPingPongPan::activate() { - waveSpeed = (k2PI * fFreq / 100.0f)/(float)d_getSampleRate(); + waveSpeed = (k2PI * fFreq / 100.0f)/(float)getSampleRate(); } -void DistrhoPluginPingPongPan::d_deactivate() +void DistrhoPluginPingPongPan::deactivate() { wavePos = 0.0f; } -void DistrhoPluginPingPongPan::d_run(const float** inputs, float** outputs, uint32_t frames) +void DistrhoPluginPingPongPan::run(const float** inputs, float** outputs, uint32_t frames) { const float* in1 = inputs[0]; const float* in2 = inputs[1]; diff --git a/plugins/PingPongPan/DistrhoPluginPingPongPan.hpp b/plugins/PingPongPan/DistrhoPluginPingPongPan.hpp index 3db06c5..91a8457 100644 --- a/plugins/PingPongPan/DistrhoPluginPingPongPan.hpp +++ b/plugins/PingPongPan/DistrhoPluginPingPongPan.hpp @@ -40,27 +40,27 @@ protected: // ------------------------------------------------------------------- // Information - const char* d_getLabel() const noexcept override + const char* getLabel() const noexcept override { return "PingPongPan"; } - const char* d_getMaker() const noexcept override + const char* getMaker() const noexcept override { return "DISTRHO"; } - const char* d_getLicense() const noexcept override + const char* getLicense() const noexcept override { return "LGPL"; } - 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('D', 'P', 'P', 'P'); } @@ -68,22 +68,22 @@ 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 - void d_activate() override; - void d_deactivate() override; - 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/PingPongPan/DistrhoUIPingPongPan.cpp b/plugins/PingPongPan/DistrhoUIPingPongPan.cpp index a005ba1..25721d2 100644 --- a/plugins/PingPongPan/DistrhoUIPingPongPan.cpp +++ b/plugins/PingPongPan/DistrhoUIPingPongPan.cpp @@ -61,13 +61,13 @@ DistrhoUIPingPongPan::DistrhoUIPingPongPan() fButtonAbout->setCallback(this); // set default values - d_programChanged(0); + programLoaded(0); } // ----------------------------------------------------------------------- // DSP Callbacks -void DistrhoUIPingPongPan::d_parameterChanged(uint32_t index, float value) +void DistrhoUIPingPongPan::parameterChanged(uint32_t index, float value) { switch (index) { @@ -80,7 +80,7 @@ void DistrhoUIPingPongPan::d_parameterChanged(uint32_t index, float value) } } -void DistrhoUIPingPongPan::d_programChanged(uint32_t index) +void DistrhoUIPingPongPan::programLoaded(uint32_t index) { if (index != 0) return; @@ -103,17 +103,17 @@ void DistrhoUIPingPongPan::imageButtonClicked(ImageButton* button, int) void DistrhoUIPingPongPan::imageKnobDragStarted(ImageKnob* knob) { - d_editParameter(knob->getId(), true); + editParameter(knob->getId(), true); } void DistrhoUIPingPongPan::imageKnobDragFinished(ImageKnob* knob) { - d_editParameter(knob->getId(), false); + editParameter(knob->getId(), false); } void DistrhoUIPingPongPan::imageKnobValueChanged(ImageKnob* knob, float value) { - d_setParameterValue(knob->getId(), value); + setParameterValue(knob->getId(), value); } void DistrhoUIPingPongPan::onDisplay() diff --git a/plugins/PingPongPan/DistrhoUIPingPongPan.hpp b/plugins/PingPongPan/DistrhoUIPingPongPan.hpp index 3683576..ad09938 100644 --- a/plugins/PingPongPan/DistrhoUIPingPongPan.hpp +++ b/plugins/PingPongPan/DistrhoUIPingPongPan.hpp @@ -45,8 +45,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