Browse Source

Update to latest dpf code

master
falkTX 7 years ago
parent
commit
9501f47174
13 changed files with 89 additions and 89 deletions
  1. +1
    -1
      dpf
  2. +8
    -8
      plugins/AmplitudeImposer/DistrhoPluginAmplitudeImposer.cpp
  3. +13
    -13
      plugins/AmplitudeImposer/DistrhoPluginAmplitudeImposer.hpp
  4. +6
    -6
      plugins/AmplitudeImposer/DistrhoUIAmplitudeImposer.cpp
  5. +2
    -2
      plugins/AmplitudeImposer/DistrhoUIAmplitudeImposer.hpp
  6. +7
    -7
      plugins/CycleShifter/DistrhoPluginCycleShifter.cpp
  7. +12
    -12
      plugins/CycleShifter/DistrhoPluginCycleShifter.hpp
  8. +6
    -6
      plugins/CycleShifter/DistrhoUICycleShifter.cpp
  9. +2
    -2
      plugins/CycleShifter/DistrhoUICycleShifter.hpp
  10. +7
    -7
      plugins/SoulForce/DistrhoPluginSoulForce.cpp
  11. +11
    -11
      plugins/SoulForce/DistrhoPluginSoulForce.hpp
  12. +12
    -12
      plugins/SoulForce/DistrhoUISoulForce.cpp
  13. +2
    -2
      plugins/SoulForce/DistrhoUISoulForce.hpp

+ 1
- 1
dpf

@@ -1 +1 @@
Subproject commit f32b41625da5f988326b0657fd37ffe10ff7f2e7
Subproject commit 2a66f39cdf7b5e28d3cc61da78879fac47d4e9fc

+ 8
- 8
plugins/AmplitudeImposer/DistrhoPluginAmplitudeImposer.cpp View File

@@ -48,7 +48,7 @@ DistrhoPluginAmplitudeImposer::DistrhoPluginAmplitudeImposer()
// -----------------------------------------------------------------------
// Init
void DistrhoPluginAmplitudeImposer::d_initAudioPort(bool input, uint32_t index, AudioPort& port)
void DistrhoPluginAmplitudeImposer::initAudioPort(bool input, uint32_t index, AudioPort& port)
{
port.hints = 0x0;
@@ -90,7 +90,7 @@ void DistrhoPluginAmplitudeImposer::d_initAudioPort(bool input, uint32_t index,
}
}
void DistrhoPluginAmplitudeImposer::d_initParameter(uint32_t index, Parameter& parameter)
void DistrhoPluginAmplitudeImposer::initParameter(uint32_t index, Parameter& parameter)
{
parameter.hints = kParameterIsAutomable;
parameter.ranges.min = 0.0f;
@@ -111,7 +111,7 @@ void DistrhoPluginAmplitudeImposer::d_initParameter(uint32_t index, Parameter& p
}
}
void DistrhoPluginAmplitudeImposer::d_initProgramName(uint32_t index, d_string& programName)
void DistrhoPluginAmplitudeImposer::initProgramName(uint32_t index, String& programName)
{
switch(index)
{
@@ -124,7 +124,7 @@ void DistrhoPluginAmplitudeImposer::d_initProgramName(uint32_t index, d_string&
// -----------------------------------------------------------------------
// Internal data
float DistrhoPluginAmplitudeImposer::d_getParameterValue(uint32_t index) const
float DistrhoPluginAmplitudeImposer::getParameterValue(uint32_t index) const
{
switch(index)
{
@@ -137,7 +137,7 @@ float DistrhoPluginAmplitudeImposer::d_getParameterValue(uint32_t index) const
}
}
void DistrhoPluginAmplitudeImposer::d_setParameterValue(uint32_t index, float value)
void DistrhoPluginAmplitudeImposer::setParameterValue(uint32_t index, float value)
{
switch(index)
{
@@ -150,7 +150,7 @@ void DistrhoPluginAmplitudeImposer::d_setParameterValue(uint32_t index, float va
}
}
void DistrhoPluginAmplitudeImposer::d_setProgram(uint32_t index)
void DistrhoPluginAmplitudeImposer::loadProgram(uint32_t index)
{
switch(index)
{
@@ -164,7 +164,7 @@ void DistrhoPluginAmplitudeImposer::d_setProgram(uint32_t index)
// -----------------------------------------------------------------------
// Process
void DistrhoPluginAmplitudeImposer::d_activate()
void DistrhoPluginAmplitudeImposer::activate()
{
ampEnvelope_l = 0.0f;
ampEnvelope_r = 0.0f;
@@ -173,7 +173,7 @@ void DistrhoPluginAmplitudeImposer::d_activate()
envDecay = 0.0001f;
}
void DistrhoPluginAmplitudeImposer::d_run(const float** inputs, float** outputs, uint32_t frames)
void DistrhoPluginAmplitudeImposer::run(const float** inputs, float** outputs, uint32_t frames)
{
const float* const in1 = inputs[0];
const float* const in2 = inputs[1];


+ 13
- 13
plugins/AmplitudeImposer/DistrhoPluginAmplitudeImposer.hpp View File

@@ -46,27 +46,27 @@ protected:
// -------------------------------------------------------------------
// Information
const char* d_getLabel() const noexcept override
const char* getLabel() const noexcept override
{
return "AmplitudeImposer";
}
const char* d_getMaker() const noexcept override
const char* getMaker() const noexcept override
{
return "ndc Plugs";
}
const char* d_getLicense() const noexcept override
const char* getLicense() const noexcept override
{
return "MIT";
}
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('A', 'm', 'I', 'm');
}
@@ -74,22 +74,22 @@ protected:
// -------------------------------------------------------------------
// Init
void d_initAudioPort(bool input, uint32_t index, AudioPort& port) override;
void d_initParameter(uint32_t index, Parameter& parameter) override;
void d_initProgramName(uint32_t index, d_string& programName) override;
void initAudioPort(bool input, uint32_t index, AudioPort& port) 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_run(const float** inputs, float** outputs, uint32_t frames) override;
void activate() override;
void run(const float** inputs, float** outputs, uint32_t frames) override;
// -------------------------------------------------------------------


+ 6
- 6
plugins/AmplitudeImposer/DistrhoUIAmplitudeImposer.cpp View File

@@ -53,13 +53,13 @@ DistrhoUIAmplitudeImposer::DistrhoUIAmplitudeImposer()
fSliderThres->setCallback(this);

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

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

void DistrhoUIAmplitudeImposer::d_parameterChanged(uint32_t index, float value)
void DistrhoUIAmplitudeImposer::parameterChanged(uint32_t index, float value)
{
switch (index)
{
@@ -72,7 +72,7 @@ void DistrhoUIAmplitudeImposer::d_parameterChanged(uint32_t index, float value)
}
}

void DistrhoUIAmplitudeImposer::d_programChanged(uint32_t index)
void DistrhoUIAmplitudeImposer::programLoaded(uint32_t index)
{
switch(index)
{
@@ -88,17 +88,17 @@ void DistrhoUIAmplitudeImposer::d_programChanged(uint32_t index)

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

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

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

void DistrhoUIAmplitudeImposer::onDisplay()


+ 2
- 2
plugins/AmplitudeImposer/DistrhoUIAmplitudeImposer.hpp View File

@@ -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


+ 7
- 7
plugins/CycleShifter/DistrhoPluginCycleShifter.cpp View File

@@ -43,7 +43,7 @@ DistrhoPluginCycleShifter::DistrhoPluginCycleShifter()
// -----------------------------------------------------------------------
// Init
void DistrhoPluginCycleShifter::d_initParameter(uint32_t index, Parameter& parameter)
void DistrhoPluginCycleShifter::initParameter(uint32_t index, Parameter& parameter)
{
parameter.hints = kParameterIsAutomable;
parameter.ranges.min = 0.0f;
@@ -64,7 +64,7 @@ void DistrhoPluginCycleShifter::d_initParameter(uint32_t index, Parameter& param
}
}
void DistrhoPluginCycleShifter::d_initProgramName(uint32_t index, d_string& programName)
void DistrhoPluginCycleShifter::initProgramName(uint32_t index, String& programName)
{
switch(index)
{
@@ -77,7 +77,7 @@ void DistrhoPluginCycleShifter::d_initProgramName(uint32_t index, d_string& prog
// -----------------------------------------------------------------------
// Internal data
float DistrhoPluginCycleShifter::d_getParameterValue(uint32_t index) const
float DistrhoPluginCycleShifter::getParameterValue(uint32_t index) const
{
switch(index)
{
@@ -90,7 +90,7 @@ float DistrhoPluginCycleShifter::d_getParameterValue(uint32_t index) const
}
}
void DistrhoPluginCycleShifter::d_setParameterValue(uint32_t index, float value)
void DistrhoPluginCycleShifter::setParameterValue(uint32_t index, float value)
{
switch(index)
{
@@ -103,7 +103,7 @@ void DistrhoPluginCycleShifter::d_setParameterValue(uint32_t index, float value)
}
}
void DistrhoPluginCycleShifter::d_setProgram(uint32_t index)
void DistrhoPluginCycleShifter::loadProgram(uint32_t index)
{
switch(index)
{
@@ -117,7 +117,7 @@ void DistrhoPluginCycleShifter::d_setProgram(uint32_t index)
// -----------------------------------------------------------------------
// Process
void DistrhoPluginCycleShifter::d_activate()
void DistrhoPluginCycleShifter::activate()
{
std::memset(CycleBuffer, 0, sizeof(float)*BUFFER_SIZE);
OutIndex = 0;
@@ -126,7 +126,7 @@ void DistrhoPluginCycleShifter::d_activate()
EnvOld = 0.0f;
}
void DistrhoPluginCycleShifter::d_run(const float** inputs, float** outputs, uint32_t frames)
void DistrhoPluginCycleShifter::run(const float** inputs, float** outputs, uint32_t frames)
{
const float* in = inputs[0];
/**/ float* out = outputs[0];


+ 12
- 12
plugins/CycleShifter/DistrhoPluginCycleShifter.hpp View File

@@ -48,27 +48,27 @@ protected:
// -------------------------------------------------------------------
// Information
const char* d_getLabel() const noexcept override
const char* getLabel() const noexcept override
{
return "CycleShifter";
}
const char* d_getMaker() const noexcept override
const char* getMaker() const noexcept override
{
return "ndc Plugs";
}
const char* d_getLicense() const noexcept override
const char* getLicense() const noexcept override
{
return "MIT";
}
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('C', 'S', 'f', 't');
}
@@ -76,21 +76,21 @@ 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_run(const float** inputs, float** outputs, uint32_t frames) override;
void activate() override;
void run(const float** inputs, float** outputs, uint32_t frames) override;
// -------------------------------------------------------------------


+ 6
- 6
plugins/CycleShifter/DistrhoUICycleShifter.cpp View File

@@ -53,13 +53,13 @@ DistrhoUICycleShifter::DistrhoUICycleShifter()
fSliderInputVol->setCallback(this);

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

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

void DistrhoUICycleShifter::d_parameterChanged(uint32_t index, float value)
void DistrhoUICycleShifter::parameterChanged(uint32_t index, float value)
{
switch (index)
{
@@ -72,7 +72,7 @@ void DistrhoUICycleShifter::d_parameterChanged(uint32_t index, float value)
}
}

void DistrhoUICycleShifter::d_programChanged(uint32_t index)
void DistrhoUICycleShifter::programLoaded(uint32_t index)
{
switch(index)
{
@@ -88,17 +88,17 @@ void DistrhoUICycleShifter::d_programChanged(uint32_t index)

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

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

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

void DistrhoUICycleShifter::onDisplay()


+ 2
- 2
plugins/CycleShifter/DistrhoUICycleShifter.hpp View File

@@ -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


+ 7
- 7
plugins/SoulForce/DistrhoPluginSoulForce.cpp View File

@@ -36,13 +36,13 @@ DistrhoPluginSoulForce::DistrhoPluginSoulForce()
footEnv(0.0f)
{
// set initial values
d_setProgram(0);
loadProgram(0);
}
// -----------------------------------------------------------------------
// Init
void DistrhoPluginSoulForce::d_initParameter(uint32_t index, Parameter& parameter)
void DistrhoPluginSoulForce::initParameter(uint32_t index, Parameter& parameter)
{
parameter.hints = kParameterIsAutomable;
parameter.ranges.min = 0.0f;
@@ -75,7 +75,7 @@ void DistrhoPluginSoulForce::d_initParameter(uint32_t index, Parameter& paramete
}
}
void DistrhoPluginSoulForce::d_initProgramName(uint32_t index, d_string& programName)
void DistrhoPluginSoulForce::initProgramName(uint32_t index, String& programName)
{
switch(index)
{
@@ -112,12 +112,12 @@ void DistrhoPluginSoulForce::d_initProgramName(uint32_t index, d_string& program
// -----------------------------------------------------------------------
// Internal data
float DistrhoPluginSoulForce::d_getParameterValue(uint32_t index) const
float DistrhoPluginSoulForce::getParameterValue(uint32_t index) const
{
return parameters[index];
}
void DistrhoPluginSoulForce::d_setParameterValue(uint32_t index, float value)
void DistrhoPluginSoulForce::setParameterValue(uint32_t index, float value)
{
parameters[index] = value;
@@ -133,7 +133,7 @@ void DistrhoPluginSoulForce::d_setParameterValue(uint32_t index, float value)
}
}
void DistrhoPluginSoulForce::d_setProgram(uint32_t index)
void DistrhoPluginSoulForce::loadProgram(uint32_t index)
{
switch(index)
{
@@ -197,7 +197,7 @@ void DistrhoPluginSoulForce::d_setProgram(uint32_t index)
// -----------------------------------------------------------------------
// Process
void DistrhoPluginSoulForce::d_run(const float** inputs, float** outputs, uint32_t frames)
void DistrhoPluginSoulForce::run(const float** inputs, float** outputs, uint32_t frames)
{
float tempf, tempf2;
float inLeft, inRight;


+ 11
- 11
plugins/SoulForce/DistrhoPluginSoulForce.hpp View File

@@ -48,27 +48,27 @@ protected:
// -------------------------------------------------------------------
// Information
const char* d_getLabel() const noexcept override
const char* getLabel() const noexcept override
{
return "SoulForce";
}
const char* d_getMaker() const noexcept override
const char* getMaker() const noexcept override
{
return "ndc Plugs";
}
const char* d_getLicense() const noexcept override
const char* getLicense() const noexcept override
{
return "MIT";
}
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('S', 'l', 'F', 'r');
}
@@ -76,20 +76,20 @@ 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_run(const float** inputs, float** outputs, uint32_t frames) override;
void run(const float** inputs, float** outputs, uint32_t frames) override;
// -------------------------------------------------------------------


+ 12
- 12
plugins/SoulForce/DistrhoUISoulForce.cpp View File

@@ -75,13 +75,13 @@ DistrhoUISoulForce::DistrhoUISoulForce()
fButtonFoot->setCallback(this);

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

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

void DistrhoUISoulForce::d_parameterChanged(uint32_t index, float value)
void DistrhoUISoulForce::parameterChanged(uint32_t index, float value)
{
switch (index)
{
@@ -104,7 +104,7 @@ void DistrhoUISoulForce::d_parameterChanged(uint32_t index, float value)
}
}

void DistrhoUISoulForce::d_programChanged(uint32_t index)
void DistrhoUISoulForce::programLoaded(uint32_t index)
{
switch(index)
{
@@ -168,17 +168,17 @@ void DistrhoUISoulForce::d_programChanged(uint32_t index)

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

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

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

void DistrhoUISoulForce::imageButtonClicked(ImageButton* imageButton, int)
@@ -190,9 +190,9 @@ void DistrhoUISoulForce::imageButtonClicked(ImageButton* imageButton, int)

fFootDown = !fFootDown;

d_editParameter(buttonId, true);
d_setParameterValue(buttonId, fFootDown ? 1.0f : 0.0f);
d_editParameter(buttonId, false);
editParameter(buttonId, true);
setParameterValue(buttonId, fFootDown ? 1.0f : 0.0f);
editParameter(buttonId, false);

repaint();
}
@@ -201,9 +201,9 @@ void DistrhoUISoulForce::imageSwitchClicked(ImageSwitch* imageSwitch, bool down)
{
const uint buttonId(imageSwitch->getId());

d_editParameter(buttonId, true);
d_setParameterValue(buttonId, down ? 1.0f : 0.0f);
d_editParameter(buttonId, false);
editParameter(buttonId, true);
setParameterValue(buttonId, down ? 1.0f : 0.0f);
editParameter(buttonId, false);
}

void DistrhoUISoulForce::onDisplay()


+ 2
- 2
plugins/SoulForce/DistrhoUISoulForce.hpp View File

@@ -54,8 +54,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


Loading…
Cancel
Save