Browse Source

Fix name conflict with SlewLimiter

tags/v0.4.0
Andrew Belt 8 years ago
parent
commit
e73037656b
2 changed files with 12 additions and 12 deletions
  1. +2
    -2
      src/Rampage.cpp
  2. +10
    -10
      src/SlewLimiter.cpp

+ 2
- 2
src/Rampage.cpp View File

@@ -94,13 +94,13 @@ RampageWidget::RampageWidget() {
addInput(createInput<PJ3410Port>(Vec(142-3, 290-3), module, Rampage::CYCLE_B_INPUT));

addParam(createParam<BefacoSwitch>(Vec(96-2, 35-3), module, Rampage::RANGE_A_PARAM, 0.0, 2.0, 0.0));
addParam(createParam<BefacoTinyKnob>(Vec(27, 91), module, Rampage::SHAPE_A_PARAM, 0.0, 1.0, 0.0));
addParam(createParam<BefacoTinyKnob>(Vec(27, 90), module, Rampage::SHAPE_A_PARAM, 0.0, 1.0, 0.0));
addParam(createParam<BefacoPush>(Vec(72, 82), module, Rampage::TRIGG_A_PARAM, 0.0, 1.0, 0.0));
addParam(createParam<BefacoSlidePot>(Vec(21-5, 140-5), module, Rampage::RISE_A_PARAM, 0.0, 1.0, 0.0));
addParam(createParam<BefacoSlidePot>(Vec(62-5, 140-5), module, Rampage::FALL_A_PARAM, 0.0, 1.0, 0.0));
addParam(createParam<BefacoSwitch>(Vec(101, 240-2), module, Rampage::CYCLE_A_PARAM, 0.0, 1.0, 0.0));
addParam(createParam<BefacoSwitch>(Vec(149-2, 35-3), module, Rampage::RANGE_B_PARAM, 0.0, 2.0, 0.0));
addParam(createParam<BefacoTinyKnob>(Vec(217, 91), module, Rampage::SHAPE_B_PARAM, 0.0, 1.0, 0.0));
addParam(createParam<BefacoTinyKnob>(Vec(217, 90), module, Rampage::SHAPE_B_PARAM, 0.0, 1.0, 0.0));
addParam(createParam<BefacoPush>(Vec(170, 82), module, Rampage::TRIGG_B_PARAM, 0.0, 1.0, 0.0));
addParam(createParam<BefacoSlidePot>(Vec(202-5, 140-5), module, Rampage::RISE_B_PARAM, 0.0, 1.0, 0.0));
addParam(createParam<BefacoSlidePot>(Vec(243-5, 140-5), module, Rampage::FALL_B_PARAM, 0.0, 1.0, 0.0));


+ 10
- 10
src/SlewLimiter.cpp View File

@@ -26,13 +26,13 @@ struct SlewLimiter : Module {
};


SlewLimiter::SlewLimiter() {
::SlewLimiter::SlewLimiter() {
params.resize(NUM_PARAMS);
inputs.resize(NUM_INPUTS);
outputs.resize(NUM_OUTPUTS);
}

void SlewLimiter::step() {
void ::SlewLimiter::step() {
float input = getf(inputs[IN_INPUT]);
float shape = params[SHAPE_PARAM];

@@ -64,7 +64,7 @@ void SlewLimiter::step() {


SlewLimiterWidget::SlewLimiterWidget() {
SlewLimiter *module = new SlewLimiter();
::SlewLimiter *module = new ::SlewLimiter();
setModule(module);
box.size = Vec(15*6, 380);

@@ -78,14 +78,14 @@ SlewLimiterWidget::SlewLimiterWidget() {
addChild(createScrew<ScrewBlack>(Vec(15, 0)));
addChild(createScrew<ScrewBlack>(Vec(15, 365)));

addParam(createParam<Davies1900hWhiteKnob>(Vec(26, 39), module, SlewLimiter::SHAPE_PARAM, 0.0, 1.0, 0.0));
addParam(createParam<Davies1900hWhiteKnob>(Vec(26, 39), module, ::SlewLimiter::SHAPE_PARAM, 0.0, 1.0, 0.0));

addParam(createParam<BefacoSlidePot>(Vec(15, 102), module, SlewLimiter::RISE_PARAM, 0.0, 1.0, 0.0));
addParam(createParam<BefacoSlidePot>(Vec(60, 102), module, SlewLimiter::FALL_PARAM, 0.0, 1.0, 0.0));
addParam(createParam<BefacoSlidePot>(Vec(15, 102), module, ::SlewLimiter::RISE_PARAM, 0.0, 1.0, 0.0));
addParam(createParam<BefacoSlidePot>(Vec(60, 102), module, ::SlewLimiter::FALL_PARAM, 0.0, 1.0, 0.0));

addInput(createInput<PJ3410Port>(Vec(6, 270), module, SlewLimiter::RISE_INPUT));
addInput(createInput<PJ3410Port>(Vec(52, 270), module, SlewLimiter::FALL_INPUT));
addInput(createInput<PJ3410Port>(Vec(6, 270), module, ::SlewLimiter::RISE_INPUT));
addInput(createInput<PJ3410Port>(Vec(52, 270), module, ::SlewLimiter::FALL_INPUT));

addInput(createInput<PJ3410Port>(Vec(6, 320), module, SlewLimiter::IN_INPUT));
addOutput(createOutput<PJ3410Port>(Vec(52, 320), module, SlewLimiter::OUT_OUTPUT));
addInput(createInput<PJ3410Port>(Vec(6, 320), module, ::SlewLimiter::IN_INPUT));
addOutput(createOutput<PJ3410Port>(Vec(52, 320), module, ::SlewLimiter::OUT_OUTPUT));
}

Loading…
Cancel
Save