Browse Source

Update to latest dpf

pull/1/head
falkTX 10 years ago
parent
commit
1741a50127
13 changed files with 114 additions and 114 deletions
  1. +1
    -1
      dpf
  2. +15
    -15
      plugins/3BandEQ/DistrhoPlugin3BandEQ.cpp
  3. +13
    -13
      plugins/3BandEQ/DistrhoPlugin3BandEQ.hpp
  4. +9
    -9
      plugins/3BandEQ/DistrhoUI3BandEQ.cpp
  5. +2
    -2
      plugins/3BandEQ/DistrhoUI3BandEQ.hpp
  6. +15
    -15
      plugins/3BandSplitter/DistrhoPlugin3BandSplitter.cpp
  7. +13
    -13
      plugins/3BandSplitter/DistrhoPlugin3BandSplitter.hpp
  8. +9
    -9
      plugins/3BandSplitter/DistrhoUI3BandSplitter.cpp
  9. +2
    -2
      plugins/3BandSplitter/DistrhoUI3BandSplitter.hpp
  10. +14
    -14
      plugins/PingPongPan/DistrhoPluginPingPongPan.cpp
  11. +13
    -13
      plugins/PingPongPan/DistrhoPluginPingPongPan.hpp
  12. +6
    -6
      plugins/PingPongPan/DistrhoUIPingPongPan.cpp
  13. +2
    -2
      plugins/PingPongPan/DistrhoUIPingPongPan.hpp

+ 1
- 1
dpf

@@ -1 +1 @@
Subproject commit 48041c91b7b016e17da84c404609b80b444fb2ba
Subproject commit 2a66f39cdf7b5e28d3cc61da78879fac47d4e9fc

+ 15
- 15
plugins/3BandEQ/DistrhoPlugin3BandEQ.cpp View File

@@ -31,16 +31,16 @@ DistrhoPlugin3BandEQ::DistrhoPlugin3BandEQ()
: Plugin(paramCount, 1, 0) // 1 program, 0 states : Plugin(paramCount, 1, 0) // 1 program, 0 states
{ {
// set default values // set default values
d_setProgram(0);
loadProgram(0);
// reset // reset
d_deactivate();
deactivate();
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// Init // Init
void DistrhoPlugin3BandEQ::d_initParameter(uint32_t index, Parameter& parameter)
void DistrhoPlugin3BandEQ::initParameter(uint32_t index, Parameter& parameter)
{ {
switch (index) 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) if (index != 0)
return; return;
@@ -117,7 +117,7 @@ void DistrhoPlugin3BandEQ::d_initProgramName(uint32_t index, d_string& programNa
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// Internal data // Internal data
float DistrhoPlugin3BandEQ::d_getParameterValue(uint32_t index) const
float DistrhoPlugin3BandEQ::getParameterValue(uint32_t index) const
{ {
switch (index) 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; return;
switch (index) switch (index)
@@ -164,21 +164,21 @@ void DistrhoPlugin3BandEQ::d_setParameterValue(uint32_t index, float value)
case paramLowMidFreq: case paramLowMidFreq:
fLowMidFreq = std::fmin(value, fMidHighFreq); fLowMidFreq = std::fmin(value, fMidHighFreq);
freqLP = fLowMidFreq; 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; a0LP = 1.0f - xLP;
b1LP = -xLP; b1LP = -xLP;
break; break;
case paramMidHighFreq: case paramMidHighFreq:
fMidHighFreq = std::fmax(value, fLowMidFreq); fMidHighFreq = std::fmax(value, fLowMidFreq);
freqHP = fMidHighFreq; 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; a0HP = 1.0f - xHP;
b1HP = -xHP; b1HP = -xHP;
break; break;
} }
} }
void DistrhoPlugin3BandEQ::d_setProgram(uint32_t index)
void DistrhoPlugin3BandEQ::loadProgram(uint32_t index)
{ {
if (index != 0) if (index != 0)
return; return;
@@ -197,15 +197,15 @@ void DistrhoPlugin3BandEQ::d_setProgram(uint32_t index)
freqHP = 2000.0f; freqHP = 2000.0f;
// reset filter values // reset filter values
d_activate();
activate();
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// Process // 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); xLP = std::exp(-2.0f * kPI * freqLP / sr);
@@ -222,13 +222,13 @@ void DistrhoPlugin3BandEQ::d_activate()
b1HP = -xHP; b1HP = -xHP;
} }
void DistrhoPlugin3BandEQ::d_deactivate()
void DistrhoPlugin3BandEQ::deactivate()
{ {
out1LP = out2LP = out1HP = out2HP = 0.0f; out1LP = out2LP = out1HP = out2HP = 0.0f;
tmp1LP = tmp2LP = tmp1HP = tmp2HP = 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* in1 = inputs[0];
const float* in2 = inputs[1]; const float* in2 = inputs[1];


+ 13
- 13
plugins/3BandEQ/DistrhoPlugin3BandEQ.hpp View File

@@ -44,27 +44,27 @@ protected:
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Information // Information
const char* d_getLabel() const noexcept override
const char* getLabel() const noexcept override
{ {
return "3BandEQ"; return "3BandEQ";
} }
const char* d_getMaker() const noexcept override
const char* getMaker() const noexcept override
{ {
return "DISTRHO"; return "DISTRHO";
} }
const char* d_getLicense() const noexcept override
const char* getLicense() const noexcept override
{ {
return "LGPL"; return "LGPL";
} }
uint32_t d_getVersion() const noexcept override
uint32_t getVersion() const noexcept override
{ {
return 0x1000; return 0x1000;
} }
int64_t d_getUniqueId() const noexcept override
int64_t getUniqueId() const noexcept override
{ {
return d_cconst('D', '3', 'E', 'Q'); return d_cconst('D', '3', 'E', 'Q');
} }
@@ -72,22 +72,22 @@ protected:
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Init // 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 // 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 // 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;
// ------------------------------------------------------------------- // -------------------------------------------------------------------


+ 9
- 9
plugins/3BandEQ/DistrhoUI3BandEQ.cpp View File

@@ -101,13 +101,13 @@ DistrhoUI3BandEQ::DistrhoUI3BandEQ()
fButtonAbout->setCallback(this); fButtonAbout->setCallback(this);


// set default values // set default values
d_programChanged(0);
programLoaded(0);
} }


// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// DSP Callbacks // DSP Callbacks


void DistrhoUI3BandEQ::d_parameterChanged(uint32_t index, float value)
void DistrhoUI3BandEQ::parameterChanged(uint32_t index, float value)
{ {
switch (index) 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) if (index != 0)
return; return;
@@ -159,32 +159,32 @@ void DistrhoUI3BandEQ::imageButtonClicked(ImageButton* button, int)


void DistrhoUI3BandEQ::imageKnobDragStarted(ImageKnob* knob) void DistrhoUI3BandEQ::imageKnobDragStarted(ImageKnob* knob)
{ {
d_editParameter(knob->getId(), true);
editParameter(knob->getId(), true);
} }


void DistrhoUI3BandEQ::imageKnobDragFinished(ImageKnob* knob) void DistrhoUI3BandEQ::imageKnobDragFinished(ImageKnob* knob)
{ {
d_editParameter(knob->getId(), false);
editParameter(knob->getId(), false);
} }


void DistrhoUI3BandEQ::imageKnobValueChanged(ImageKnob* knob, float value) void DistrhoUI3BandEQ::imageKnobValueChanged(ImageKnob* knob, float value)
{ {
d_setParameterValue(knob->getId(), value);
setParameterValue(knob->getId(), value);
} }


void DistrhoUI3BandEQ::imageSliderDragStarted(ImageSlider* slider) void DistrhoUI3BandEQ::imageSliderDragStarted(ImageSlider* slider)
{ {
d_editParameter(slider->getId(), true);
editParameter(slider->getId(), true);
} }


void DistrhoUI3BandEQ::imageSliderDragFinished(ImageSlider* slider) void DistrhoUI3BandEQ::imageSliderDragFinished(ImageSlider* slider)
{ {
d_editParameter(slider->getId(), false);
editParameter(slider->getId(), false);
} }


void DistrhoUI3BandEQ::imageSliderValueChanged(ImageSlider* slider, float value) void DistrhoUI3BandEQ::imageSliderValueChanged(ImageSlider* slider, float value)
{ {
d_setParameterValue(slider->getId(), value);
setParameterValue(slider->getId(), value);
} }


void DistrhoUI3BandEQ::onDisplay() void DistrhoUI3BandEQ::onDisplay()


+ 2
- 2
plugins/3BandEQ/DistrhoUI3BandEQ.hpp View File

@@ -48,8 +48,8 @@ protected:
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// DSP Callbacks // 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 // Widget Callbacks


+ 15
- 15
plugins/3BandSplitter/DistrhoPlugin3BandSplitter.cpp View File

@@ -31,16 +31,16 @@ DistrhoPlugin3BandSplitter::DistrhoPlugin3BandSplitter()
: Plugin(paramCount, 1, 0) // 1 program, 0 states : Plugin(paramCount, 1, 0) // 1 program, 0 states
{ {
// set default values // set default values
d_setProgram(0);
loadProgram(0);
// reset // reset
d_deactivate();
deactivate();
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// Init // Init
void DistrhoPlugin3BandSplitter::d_initParameter(uint32_t index, Parameter& parameter)
void DistrhoPlugin3BandSplitter::initParameter(uint32_t index, Parameter& parameter)
{ {
switch (index) 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) if (index != 0)
return; return;
@@ -117,7 +117,7 @@ void DistrhoPlugin3BandSplitter::d_initProgramName(uint32_t index, d_string& pro
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// Internal data // Internal data
float DistrhoPlugin3BandSplitter::d_getParameterValue(uint32_t index) const
float DistrhoPlugin3BandSplitter::getParameterValue(uint32_t index) const
{ {
switch (index) 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; return;
switch (index) switch (index)
@@ -164,21 +164,21 @@ void DistrhoPlugin3BandSplitter::d_setParameterValue(uint32_t index, float value
case paramLowMidFreq: case paramLowMidFreq:
fLowMidFreq = std::fmin(value, fMidHighFreq); fLowMidFreq = std::fmin(value, fMidHighFreq);
freqLP = fLowMidFreq; 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; a0LP = 1.0f - xLP;
b1LP = -xLP; b1LP = -xLP;
break; break;
case paramMidHighFreq: case paramMidHighFreq:
fMidHighFreq = std::fmax(value, fLowMidFreq); fMidHighFreq = std::fmax(value, fLowMidFreq);
freqHP = fMidHighFreq; 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; a0HP = 1.0f - xHP;
b1HP = -xHP; b1HP = -xHP;
break; break;
} }
} }
void DistrhoPlugin3BandSplitter::d_setProgram(uint32_t index)
void DistrhoPlugin3BandSplitter::loadProgram(uint32_t index)
{ {
if (index != 0) if (index != 0)
return; return;
@@ -197,15 +197,15 @@ void DistrhoPlugin3BandSplitter::d_setProgram(uint32_t index)
freqHP = 2000.0f; freqHP = 2000.0f;
// reset filter values // reset filter values
d_activate();
activate();
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// Process // 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); xLP = std::exp(-2.0f * kPI * freqLP / sr);
@@ -222,13 +222,13 @@ void DistrhoPlugin3BandSplitter::d_activate()
b1HP = -xHP; b1HP = -xHP;
} }
void DistrhoPlugin3BandSplitter::d_deactivate()
void DistrhoPlugin3BandSplitter::deactivate()
{ {
out1LP = out2LP = out1HP = out2HP = 0.0f; out1LP = out2LP = out1HP = out2HP = 0.0f;
tmp1LP = tmp2LP = tmp1HP = tmp2HP = 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* in1 = inputs[0];
const float* in2 = inputs[1]; const float* in2 = inputs[1];


+ 13
- 13
plugins/3BandSplitter/DistrhoPlugin3BandSplitter.hpp View File

@@ -44,27 +44,27 @@ protected:
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Information // Information
const char* d_getLabel() const noexcept override
const char* getLabel() const noexcept override
{ {
return "3BandSplitter"; return "3BandSplitter";
} }
const char* d_getMaker() const noexcept override
const char* getMaker() const noexcept override
{ {
return "DISTRHO"; return "DISTRHO";
} }
const char* d_getLicense() const noexcept override
const char* getLicense() const noexcept override
{ {
return "LGPL"; return "LGPL";
} }
uint32_t d_getVersion() const noexcept override
uint32_t getVersion() const noexcept override
{ {
return 0x1000; return 0x1000;
} }
int64_t d_getUniqueId() const noexcept override
int64_t getUniqueId() const noexcept override
{ {
return d_cconst('D', '3', 'E', 'S'); return d_cconst('D', '3', 'E', 'S');
} }
@@ -72,22 +72,22 @@ protected:
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Init // 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 // 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 // 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;
// ------------------------------------------------------------------- // -------------------------------------------------------------------


+ 9
- 9
plugins/3BandSplitter/DistrhoUI3BandSplitter.cpp View File

@@ -101,13 +101,13 @@ DistrhoUI3BandSplitter::DistrhoUI3BandSplitter()
fButtonAbout->setCallback(this); fButtonAbout->setCallback(this);


// set default values // set default values
d_programChanged(0);
programLoaded(0);
} }


// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// DSP Callbacks // DSP Callbacks


void DistrhoUI3BandSplitter::d_parameterChanged(uint32_t index, float value)
void DistrhoUI3BandSplitter::parameterChanged(uint32_t index, float value)
{ {
switch (index) 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) if (index != 0)
return; return;
@@ -159,32 +159,32 @@ void DistrhoUI3BandSplitter::imageButtonClicked(ImageButton* button, int)


void DistrhoUI3BandSplitter::imageKnobDragStarted(ImageKnob* knob) void DistrhoUI3BandSplitter::imageKnobDragStarted(ImageKnob* knob)
{ {
d_editParameter(knob->getId(), true);
editParameter(knob->getId(), true);
} }


void DistrhoUI3BandSplitter::imageKnobDragFinished(ImageKnob* knob) void DistrhoUI3BandSplitter::imageKnobDragFinished(ImageKnob* knob)
{ {
d_editParameter(knob->getId(), false);
editParameter(knob->getId(), false);
} }


void DistrhoUI3BandSplitter::imageKnobValueChanged(ImageKnob* knob, float value) void DistrhoUI3BandSplitter::imageKnobValueChanged(ImageKnob* knob, float value)
{ {
d_setParameterValue(knob->getId(), value);
setParameterValue(knob->getId(), value);
} }


void DistrhoUI3BandSplitter::imageSliderDragStarted(ImageSlider* slider) void DistrhoUI3BandSplitter::imageSliderDragStarted(ImageSlider* slider)
{ {
d_editParameter(slider->getId(), true);
editParameter(slider->getId(), true);
} }


void DistrhoUI3BandSplitter::imageSliderDragFinished(ImageSlider* slider) void DistrhoUI3BandSplitter::imageSliderDragFinished(ImageSlider* slider)
{ {
d_editParameter(slider->getId(), false);
editParameter(slider->getId(), false);
} }


void DistrhoUI3BandSplitter::imageSliderValueChanged(ImageSlider* slider, float value) void DistrhoUI3BandSplitter::imageSliderValueChanged(ImageSlider* slider, float value)
{ {
d_setParameterValue(slider->getId(), value);
setParameterValue(slider->getId(), value);
} }


void DistrhoUI3BandSplitter::onDisplay() void DistrhoUI3BandSplitter::onDisplay()


+ 2
- 2
plugins/3BandSplitter/DistrhoUI3BandSplitter.hpp View File

@@ -48,8 +48,8 @@ protected:
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// DSP Callbacks // 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 // Widget Callbacks


+ 14
- 14
plugins/PingPongPan/DistrhoPluginPingPongPan.cpp View File

@@ -29,16 +29,16 @@ DistrhoPluginPingPongPan::DistrhoPluginPingPongPan()
: Plugin(paramCount, 1, 0) // 1 program, 0 states : Plugin(paramCount, 1, 0) // 1 program, 0 states
{ {
// set default values // set default values
d_setProgram(0);
loadProgram(0);
// reset // reset
d_deactivate();
deactivate();
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// Init // Init
void DistrhoPluginPingPongPan::d_initParameter(uint32_t index, Parameter& parameter)
void DistrhoPluginPingPongPan::initParameter(uint32_t index, Parameter& parameter)
{ {
switch (index) 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) if (index != 0)
return; return;
@@ -74,7 +74,7 @@ void DistrhoPluginPingPongPan::d_initProgramName(uint32_t index, d_string& progr
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// Internal data // Internal data
float DistrhoPluginPingPongPan::d_getParameterValue(uint32_t index) const
float DistrhoPluginPingPongPan::getParameterValue(uint32_t index) const
{ {
switch (index) 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; return;
switch (index) switch (index)
{ {
case paramFreq: case paramFreq:
fFreq = value; fFreq = value;
waveSpeed = (k2PI * fFreq / 100.0f)/(float)d_getSampleRate();
waveSpeed = (k2PI * fFreq / 100.0f)/(float)getSampleRate();
break; break;
case paramWidth: case paramWidth:
fWidth = value; 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) if (index != 0)
return; return;
@@ -114,23 +114,23 @@ void DistrhoPluginPingPongPan::d_setProgram(uint32_t index)
fWidth = 75.0f; fWidth = 75.0f;
// reset filter values // reset filter values
d_activate();
activate();
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// Process // 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; 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* in1 = inputs[0];
const float* in2 = inputs[1]; const float* in2 = inputs[1];


+ 13
- 13
plugins/PingPongPan/DistrhoPluginPingPongPan.hpp View File

@@ -40,27 +40,27 @@ protected:
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Information // Information
const char* d_getLabel() const noexcept override
const char* getLabel() const noexcept override
{ {
return "PingPongPan"; return "PingPongPan";
} }
const char* d_getMaker() const noexcept override
const char* getMaker() const noexcept override
{ {
return "DISTRHO"; return "DISTRHO";
} }
const char* d_getLicense() const noexcept override
const char* getLicense() const noexcept override
{ {
return "LGPL"; return "LGPL";
} }
uint32_t d_getVersion() const noexcept override
uint32_t getVersion() const noexcept override
{ {
return 0x1000; return 0x1000;
} }
int64_t d_getUniqueId() const noexcept override
int64_t getUniqueId() const noexcept override
{ {
return d_cconst('D', 'P', 'P', 'P'); return d_cconst('D', 'P', 'P', 'P');
} }
@@ -68,22 +68,22 @@ protected:
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Init // 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 // 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 // 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;
// ------------------------------------------------------------------- // -------------------------------------------------------------------


+ 6
- 6
plugins/PingPongPan/DistrhoUIPingPongPan.cpp View File

@@ -61,13 +61,13 @@ DistrhoUIPingPongPan::DistrhoUIPingPongPan()
fButtonAbout->setCallback(this); fButtonAbout->setCallback(this);


// set default values // set default values
d_programChanged(0);
programLoaded(0);
} }


// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// DSP Callbacks // DSP Callbacks


void DistrhoUIPingPongPan::d_parameterChanged(uint32_t index, float value)
void DistrhoUIPingPongPan::parameterChanged(uint32_t index, float value)
{ {
switch (index) 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) if (index != 0)
return; return;
@@ -103,17 +103,17 @@ void DistrhoUIPingPongPan::imageButtonClicked(ImageButton* button, int)


void DistrhoUIPingPongPan::imageKnobDragStarted(ImageKnob* knob) void DistrhoUIPingPongPan::imageKnobDragStarted(ImageKnob* knob)
{ {
d_editParameter(knob->getId(), true);
editParameter(knob->getId(), true);
} }


void DistrhoUIPingPongPan::imageKnobDragFinished(ImageKnob* knob) void DistrhoUIPingPongPan::imageKnobDragFinished(ImageKnob* knob)
{ {
d_editParameter(knob->getId(), false);
editParameter(knob->getId(), false);
} }


void DistrhoUIPingPongPan::imageKnobValueChanged(ImageKnob* knob, float value) void DistrhoUIPingPongPan::imageKnobValueChanged(ImageKnob* knob, float value)
{ {
d_setParameterValue(knob->getId(), value);
setParameterValue(knob->getId(), value);
} }


void DistrhoUIPingPongPan::onDisplay() void DistrhoUIPingPongPan::onDisplay()


+ 2
- 2
plugins/PingPongPan/DistrhoUIPingPongPan.hpp View File

@@ -45,8 +45,8 @@ protected:
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// DSP Callbacks // 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 // Widget Callbacks


Loading…
Cancel
Save