Skip to content

Commit 215c14f

Browse files
author
falkTX
committed
Quick update to latest DPF
1 parent be32048 commit 215c14f

26 files changed

+394
-479
lines changed

‎Makefile.mk‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ endif
7777
# --------------------------------------------------------------
7878
# Check for required libs
7979

80+
# FIXME
81+
BASE_FLAGS += -DHAVE_JACK -DHAVE_LIBLO -DHAVE_DGL
82+
8083
ifeq ($(LINUX),true)
8184
ifneq ($(shell pkg-config --exists jack && echo true),true)
8285
$(error JACK missing, cannot continue)

‎dpf‎

Submodule dpf updated 101 files

‎plugins/PowerJuice/PowerJuicePlugin.cpp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ PowerJuicePlugin::PowerJuicePlugin()
2727
: Plugin(paramCount, 1, 0) // 1 program, 0 states
2828
{
2929
// set default values
30-
d_setProgram(0);
30+
loadProgram(0);
3131

3232
// reset
33-
d_deactivate();
33+
deactivate();
3434
}
3535

3636
PowerJuicePlugin::~PowerJuicePlugin()
@@ -42,12 +42,12 @@ PowerJuicePlugin::~PowerJuicePlugin()
4242
// -----------------------------------------------------------------------
4343
// Init
4444

45-
void PowerJuicePlugin::d_initParameter(uint32_t index, Parameter& parameter)
45+
void PowerJuicePlugin::initParameter(uint32_t index, Parameter& parameter)
4646
{
4747
switch (index)
4848
{
4949
case paramAttack:
50-
parameter.hints = PARAMETER_IS_AUTOMABLE;
50+
parameter.hints = kParameterIsAutomable;
5151
parameter.name = "Attack";
5252
parameter.symbol = "att";
5353
parameter.unit = "ms";
@@ -56,7 +56,7 @@ void PowerJuicePlugin::d_initParameter(uint32_t index, Parameter& parameter)
5656
parameter.ranges.max = 1000.0f;
5757
break;
5858
case paramRelease:
59-
parameter.hints = PARAMETER_IS_AUTOMABLE;
59+
parameter.hints = kParameterIsAutomable;
6060
parameter.name = "Release";
6161
parameter.symbol = "rel";
6262
parameter.unit = "ms";
@@ -65,7 +65,7 @@ void PowerJuicePlugin::d_initParameter(uint32_t index, Parameter& parameter)
6565
parameter.ranges.max = 1000.0f;
6666
break;
6767
case paramThreshold:
68-
parameter.hints = PARAMETER_IS_AUTOMABLE;
68+
parameter.hints = kParameterIsAutomable;
6969
parameter.name = "Threshold";
7070
parameter.symbol = "thr";
7171
parameter.unit = "dB";
@@ -74,7 +74,7 @@ void PowerJuicePlugin::d_initParameter(uint32_t index, Parameter& parameter)
7474
parameter.ranges.max = 0.0f;
7575
break;
7676
case paramRatio:
77-
parameter.hints = PARAMETER_IS_AUTOMABLE;
77+
parameter.hints = kParameterIsAutomable;
7878
parameter.name = "Ratio";
7979
parameter.symbol = "rat";
8080
parameter.unit = "";
@@ -83,7 +83,7 @@ void PowerJuicePlugin::d_initParameter(uint32_t index, Parameter& parameter)
8383
parameter.ranges.max = 10.0f;
8484
break;
8585
case paramMakeup:
86-
parameter.hints = PARAMETER_IS_AUTOMABLE;
86+
parameter.hints = kParameterIsAutomable;
8787
parameter.name = "Make-Up";
8888
parameter.symbol = "mak";
8989
parameter.unit = "";
@@ -92,7 +92,7 @@ void PowerJuicePlugin::d_initParameter(uint32_t index, Parameter& parameter)
9292
parameter.ranges.max = 20.0f;
9393
break;
9494
case paramMix:
95-
parameter.hints = PARAMETER_IS_AUTOMABLE;
95+
parameter.hints = kParameterIsAutomable;
9696
parameter.name = "Mix";
9797
parameter.symbol = "Mix";
9898
parameter.unit = "";
@@ -104,7 +104,7 @@ void PowerJuicePlugin::d_initParameter(uint32_t index, Parameter& parameter)
104104
}
105105
}
106106

107-
void PowerJuicePlugin::d_initProgramName(uint32_t index, d_string& programName)
107+
void PowerJuicePlugin::initProgramName(uint32_t index, String& programName)
108108
{
109109
if (index != 0)
110110
return;
@@ -115,7 +115,7 @@ void PowerJuicePlugin::d_initProgramName(uint32_t index, d_string& programName)
115115
// -----------------------------------------------------------------------
116116
// Internal data
117117

118-
float PowerJuicePlugin::d_getParameterValue(uint32_t index) const
118+
float PowerJuicePlugin::getParameterValue(uint32_t index) const
119119
{
120120
switch (index)
121121
{
@@ -136,17 +136,17 @@ float PowerJuicePlugin::d_getParameterValue(uint32_t index) const
136136
}
137137
}
138138

139-
void PowerJuicePlugin::d_setParameterValue(uint32_t index, float value)
139+
void PowerJuicePlugin::setParameterValue(uint32_t index, float value)
140140
{
141141
switch (index)
142142
{
143143
case paramAttack:
144144
attack = value;
145-
attackSamples = d_getSampleRate()*(attack/1000.0f);
145+
attackSamples = getSampleRate()*(attack/1000.0f);
146146
break;
147147
case paramRelease:
148148
release = value;
149-
releaseSamples = d_getSampleRate()*(release/1000.0f);
149+
releaseSamples = getSampleRate()*(release/1000.0f);
150150
break;
151151
case paramThreshold:
152152
threshold = value;
@@ -164,7 +164,7 @@ void PowerJuicePlugin::d_setParameterValue(uint32_t index, float value)
164164
}
165165
}
166166

167-
void PowerJuicePlugin::d_setProgram(uint32_t index)
167+
void PowerJuicePlugin::loadProgram(uint32_t index)
168168
{
169169
if (index != 0)
170170
return;
@@ -178,8 +178,8 @@ void PowerJuicePlugin::d_setProgram(uint32_t index)
178178
mix = 1.0f;
179179

180180
makeupFloat = fromDB(makeup);
181-
attackSamples = d_getSampleRate()*(attack/1000.0f);
182-
releaseSamples = d_getSampleRate()*(release/1000.0f);
181+
attackSamples = getSampleRate()*(attack/1000.0f);
182+
releaseSamples = getSampleRate()*(release/1000.0f);
183183

184184

185185

@@ -207,13 +207,13 @@ void PowerJuicePlugin::d_setProgram(uint32_t index)
207207
repaintSkip = 0;
208208

209209

210-
kFloatRMSStackCount = 400.0f/44100.0f*d_getSampleRate();
210+
kFloatRMSStackCount = 400.0f/44100.0f*getSampleRate();
211211
RMSStack.data = (float*) calloc(kFloatRMSStackCount, sizeof(float));
212212

213-
kFloatLookaheadStackCount = 800.0f/44100.0f*d_getSampleRate();
213+
kFloatLookaheadStackCount = 800.0f/44100.0f*getSampleRate();
214214
lookaheadStack.data = (float*) calloc(kFloatLookaheadStackCount, sizeof(float));
215215

216-
refreshSkip= 300.0f/44100.0f*d_getSampleRate();
216+
refreshSkip= 300.0f/44100.0f*getSampleRate();
217217

218218
std::memset(rms.data, 0, sizeof(float)*kFloatStackCount);
219219
std::memset(gainReduction.data, 0, sizeof(float)*kFloatStackCount);
@@ -225,7 +225,7 @@ void PowerJuicePlugin::d_setProgram(uint32_t index)
225225
for (int j=0; j < kFloatStackCount; ++j)
226226
history.gainReduction[j] = h +y;
227227

228-
d_activate();
228+
activate();
229229

230230
}
231231

@@ -248,16 +248,16 @@ float PowerJuicePlugin::getGainReductionHistory(int n) {
248248
// -----------------------------------------------------------------------
249249
// Process
250250

251-
void PowerJuicePlugin::d_activate()
251+
void PowerJuicePlugin::activate()
252252
{
253253
}
254254

255-
void PowerJuicePlugin::d_deactivate()
255+
void PowerJuicePlugin::deactivate()
256256
{
257257
// all values to zero
258258
}
259259

260-
void PowerJuicePlugin::d_run(const float** inputs, float** outputs, uint32_t frames)
260+
void PowerJuicePlugin::run(const float** inputs, float** outputs, uint32_t frames)
261261
{
262262
const float* in = inputs[0];
263263
float* out = outputs[0];

‎plugins/PowerJuice/PowerJuicePlugin.hpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -70,50 +70,50 @@ class PowerJuicePlugin : public Plugin
7070
// -------------------------------------------------------------------
7171
// Information
7272

73-
const char* d_getLabel() const noexcept override
73+
const char* getLabel() const noexcept override
7474
{
7575
return "PowerJuice";
7676
}
7777

78-
const char* d_getMaker() const noexcept override
78+
const char* getMaker() const noexcept override
7979
{
8080
return "Andre Sklenar";
8181
}
8282

83-
const char* d_getLicense() const noexcept override
83+
const char* getLicense() const noexcept override
8484
{
8585
return "GPL v2+";
8686
}
8787

88-
uint32_t d_getVersion() const noexcept override
88+
uint32_t getVersion() const noexcept override
8989
{
9090
return 0x1000;
9191
}
9292

93-
long d_getUniqueId() const noexcept override
93+
long getUniqueId() const noexcept override
9494
{
9595
return d_cconst('P', 'w', 'r', 'J');
9696
}
9797

9898
// -------------------------------------------------------------------
9999
// Init
100100

101-
void d_initParameter(uint32_t index, Parameter& parameter) override;
102-
void d_initProgramName(uint32_t index, d_string& programName) override;
101+
void initParameter(uint32_t index, Parameter& parameter) override;
102+
void initProgramName(uint32_t index, String& programName) override;
103103

104104
// -------------------------------------------------------------------
105105
// Internal data
106106

107-
float d_getParameterValue(uint32_t index) const override;
108-
void d_setParameterValue(uint32_t index, float value) override;
109-
void d_setProgram(uint32_t index) override;
107+
float getParameterValue(uint32_t index) const override;
108+
void setParameterValue(uint32_t index, float value) override;
109+
void loadProgram(uint32_t index) override;
110110

111111
// -------------------------------------------------------------------
112112
// Process
113113

114-
void d_activate() override;
115-
void d_deactivate() override;
116-
void d_run(const float** inputs, float** outputs, uint32_t frames) override;
114+
void activate() override;
115+
void deactivate() override;
116+
void run(const float** inputs, float** outputs, uint32_t frames) override;
117117

118118
// -------------------------------------------------------------------
119119

‎plugins/PowerJuice/PowerJuiceUI.cpp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ START_NAMESPACE_DISTRHO
2727
// -----------------------------------------------------------------------
2828

2929
PowerJuiceUI::PowerJuiceUI()
30-
: UI(),
30+
: UI(PowerJuiceArtwork::backgroundWidth, PowerJuiceArtwork::backgroundHeight),
3131
fAboutWindow(this),
32-
dsp((PowerJuicePlugin*)d_getPluginInstancePointer())
32+
dsp((PowerJuicePlugin*)getPluginInstancePointer())
3333
{
3434
DISTRHO_SAFE_ASSERT(dsp != nullptr);
3535

@@ -100,13 +100,13 @@ PowerJuiceUI::PowerJuiceUI()
100100
fButtonAbout->setCallback(this);
101101

102102
// set default values
103-
d_programChanged(0);
103+
programLoaded(0);
104104
}
105105

106106
// -----------------------------------------------------------------------
107107
// DSP Callbacks
108108

109-
void PowerJuiceUI::d_parameterChanged(uint32_t index, float value)
109+
void PowerJuiceUI::parameterChanged(uint32_t index, float value)
110110
{
111111
switch (index)
112112
{
@@ -131,7 +131,7 @@ void PowerJuiceUI::d_parameterChanged(uint32_t index, float value)
131131
}
132132
}
133133

134-
void PowerJuiceUI::d_programChanged(uint32_t index)
134+
void PowerJuiceUI::programLoaded(uint32_t index)
135135
{
136136
if (index != 0)
137137
return;
@@ -159,53 +159,53 @@ void PowerJuiceUI::imageButtonClicked(ImageButton* button, int)
159159
void PowerJuiceUI::imageKnobDragStarted(ImageKnob* knob)
160160
{
161161
if (knob == fKnobAttack)
162-
d_editParameter(PowerJuicePlugin::paramAttack, true);
162+
editParameter(PowerJuicePlugin::paramAttack, true);
163163
else if (knob == fKnobRelease)
164-
d_editParameter(PowerJuicePlugin::paramRelease, true);
164+
editParameter(PowerJuicePlugin::paramRelease, true);
165165
else if (knob == fKnobThreshold)
166-
d_editParameter(PowerJuicePlugin::paramThreshold, true);
166+
editParameter(PowerJuicePlugin::paramThreshold, true);
167167
else if (knob == fKnobRatio)
168-
d_editParameter(PowerJuicePlugin::paramRatio, true);
168+
editParameter(PowerJuicePlugin::paramRatio, true);
169169
else if (knob == fKnobMakeup)
170-
d_editParameter(PowerJuicePlugin::paramMakeup, true);
170+
editParameter(PowerJuicePlugin::paramMakeup, true);
171171
else if (knob == fKnobMix)
172-
d_editParameter(PowerJuicePlugin::paramMix, true);
172+
editParameter(PowerJuicePlugin::paramMix, true);
173173
}
174174

175175
void PowerJuiceUI::imageKnobDragFinished(ImageKnob* knob)
176176
{
177177
if (knob == fKnobAttack)
178-
d_editParameter(PowerJuicePlugin::paramAttack, false);
178+
editParameter(PowerJuicePlugin::paramAttack, false);
179179
else if (knob == fKnobRelease)
180-
d_editParameter(PowerJuicePlugin::paramRelease, false);
180+
editParameter(PowerJuicePlugin::paramRelease, false);
181181
else if (knob == fKnobThreshold)
182-
d_editParameter(PowerJuicePlugin::paramThreshold, false);
182+
editParameter(PowerJuicePlugin::paramThreshold, false);
183183
else if (knob == fKnobRatio)
184-
d_editParameter(PowerJuicePlugin::paramRatio, false);
184+
editParameter(PowerJuicePlugin::paramRatio, false);
185185
else if (knob == fKnobMakeup)
186-
d_editParameter(PowerJuicePlugin::paramMakeup, false);
186+
editParameter(PowerJuicePlugin::paramMakeup, false);
187187
else if (knob == fKnobMix)
188-
d_editParameter(PowerJuicePlugin::paramMix, false);
188+
editParameter(PowerJuicePlugin::paramMix, false);
189189
}
190190

191191
void PowerJuiceUI::imageKnobValueChanged(ImageKnob* knob, float value)
192192
{
193193
if (knob == fKnobAttack)
194-
d_setParameterValue(PowerJuicePlugin::paramAttack, value);
194+
setParameterValue(PowerJuicePlugin::paramAttack, value);
195195
else if (knob == fKnobRelease)
196-
d_setParameterValue(PowerJuicePlugin::paramRelease, value);
196+
setParameterValue(PowerJuicePlugin::paramRelease, value);
197197
else if (knob == fKnobThreshold)
198-
d_setParameterValue(PowerJuicePlugin::paramThreshold, value);
198+
setParameterValue(PowerJuicePlugin::paramThreshold, value);
199199
else if (knob == fKnobRatio)
200-
d_setParameterValue(PowerJuicePlugin::paramRatio, value);
200+
setParameterValue(PowerJuicePlugin::paramRatio, value);
201201
else if (knob == fKnobMakeup)
202-
d_setParameterValue(PowerJuicePlugin::paramMakeup, value);
202+
setParameterValue(PowerJuicePlugin::paramMakeup, value);
203203
else if (knob == fKnobMix)
204-
d_setParameterValue(PowerJuicePlugin::paramMix, value);
204+
setParameterValue(PowerJuicePlugin::paramMix, value);
205205

206206
}
207207

208-
void PowerJuiceUI::d_uiIdle()
208+
void PowerJuiceUI::uiIdle()
209209
{
210210
if (dsp != nullptr && dsp->repaintNeeded())
211211
repaint();

0 commit comments

Comments
 (0)