BogaudioModules

BogaudioModules for VCV Rack
Log | Files | Refs | README | LICENSE

commit ef58c42734591cb0928689515236fb8eff7ce135
parent 1982e99e88b8c0954736cb3cdbf14919a3aaac7c
Author: Matt Demanett <matt@demanett.net>
Date:   Fri, 17 May 2019 22:25:15 -0400

v1: creates.

Diffstat:
Msrc/AD.cpp | 30+++++++++++++++---------------
Msrc/ADSR.cpp | 28++++++++++++++--------------
Msrc/AMRM.cpp | 20++++++++++----------
Msrc/Additator.cpp | 62+++++++++++++++++++++++++++++++-------------------------------
Msrc/AddrSeq.cpp | 56++++++++++++++++++++++++++++----------------------------
Msrc/Analyzer.cpp | 50+++++++++++++++++++++++++-------------------------
Msrc/AnalyzerXL.cpp | 16++++++++--------
Msrc/Blank3.cpp | 6+++---
Msrc/Blank6.cpp | 6+++---
Msrc/Bool.cpp | 18+++++++++---------
Msrc/CVD.cpp | 18+++++++++---------
Msrc/Clpr.cpp | 22+++++++++++-----------
Msrc/Cmp.cpp | 30+++++++++++++++---------------
Msrc/DADSRH.cpp | 72++++++++++++++++++++++++++++++++++++------------------------------------
Msrc/DADSRHPlus.cpp | 94++++++++++++++++++++++++++++++++++++++++----------------------------------------
Msrc/DGate.cpp | 22+++++++++++-----------
Msrc/Detune.cpp | 16++++++++--------
Msrc/EightFO.cpp | 66+++++++++++++++++++++++++++++++++---------------------------------
Msrc/EightOne.cpp | 54+++++++++++++++++++++++++++---------------------------
Msrc/FMOp.cpp | 60++++++++++++++++++++++++++++++------------------------------
Msrc/FlipFlop.cpp | 20++++++++++----------
Msrc/Follow.cpp | 16++++++++--------
Msrc/LFO.cpp | 50+++++++++++++++++++++++++-------------------------
Msrc/LLFO.cpp | 40++++++++++++++++++++--------------------
Msrc/Lag.cpp | 18+++++++++---------
Msrc/Lmtr.cpp | 22+++++++++++-----------
Msrc/Manual.cpp | 22+++++++++++-----------
Msrc/Matrix88.cpp | 170++++++++++++++++++++++++++++++++++++++++----------------------------------------
Msrc/Mix1.cpp | 16++++++++--------
Msrc/Mix4.cpp | 62+++++++++++++++++++++++++++++++-------------------------------
Msrc/Mix8.cpp | 102++++++++++++++++++++++++++++++++++++++++----------------------------------------
Msrc/Mult.cpp | 20++++++++++----------
Msrc/Mute8.cpp | 94++++++++++++++++++++++++++++++++++++++++----------------------------------------
Msrc/Noise.cpp | 18+++++++++---------
Msrc/Nsgt.cpp | 22+++++++++++-----------
Msrc/Offset.cpp | 16++++++++--------
Msrc/OneEight.cpp | 54+++++++++++++++++++++++++++---------------------------
Msrc/Pan.cpp | 20++++++++++----------
Msrc/Pressor.cpp | 56++++++++++++++++++++++++++++----------------------------
Msrc/Reftone.cpp | 14+++++++-------
Msrc/SampleHold.cpp | 28++++++++++++++--------------
Msrc/Shaper.cpp | 46+++++++++++++++++++++++-----------------------
Msrc/ShaperPlus.cpp | 80++++++++++++++++++++++++++++++++++++++++----------------------------------------
Msrc/Slew.cpp | 20++++++++++----------
Msrc/Stack.cpp | 22+++++++++++-----------
Msrc/Sums.cpp | 20++++++++++----------
Msrc/Switch.cpp | 24++++++++++++------------
Msrc/Test.cpp | 22+++++++++++-----------
Msrc/Test2.cpp | 36++++++++++++++++++------------------
Msrc/UMix.cpp | 24++++++++++++------------
Msrc/VCA.cpp | 24++++++++++++------------
Msrc/VCAmp.cpp | 12++++++------
Msrc/VCM.cpp | 48++++++++++++++++++++++++------------------------
Msrc/VCO.cpp | 38+++++++++++++++++++-------------------
Msrc/VU.cpp | 12++++++------
Msrc/Walk.cpp | 20++++++++++----------
Msrc/Walk2.cpp | 44++++++++++++++++++++++----------------------
Msrc/XCO.cpp | 92++++++++++++++++++++++++++++++++++++++++----------------------------------------
Msrc/XFade.cpp | 20++++++++++----------
Msrc/template_panels.cpp | 84++++++++++++++++++++++++++++++++++++++++----------------------------------------
60 files changed, 1157 insertions(+), 1157 deletions(-)

diff --git a/src/AD.cpp b/src/AD.cpp @@ -73,8 +73,8 @@ struct ADWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto attackParamPosition = Vec(8.0, 33.0); @@ -95,22 +95,22 @@ struct ADWidget : ModuleWidget { auto linearLightPosition = Vec(2.5, 147.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob29>(attackParamPosition, module, AD::ATTACK_PARAM, 0.0, 1.0, 0.12)); - addParam(ParamWidget::create<Knob29>(decayParamPosition, module, AD::DECAY_PARAM, 0.0, 1.0, 0.31623)); - addParam(ParamWidget::create<StatefulButton9>(loopParamPosition, module, AD::LOOP_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<StatefulButton9>(linearParamPosition, module, AD::LINEAR_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<Knob29>(attackParamPosition, module, AD::ATTACK_PARAM, 0.0, 1.0, 0.12)); + addParam(createParam<Knob29>(decayParamPosition, module, AD::DECAY_PARAM, 0.0, 1.0, 0.31623)); + addParam(createParam<StatefulButton9>(loopParamPosition, module, AD::LOOP_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<StatefulButton9>(linearParamPosition, module, AD::LINEAR_PARAM, 0.0, 1.0, 0.0)); - addInput(Port::create<Port24>(triggerInputPosition, Port::INPUT, module, AD::TRIGGER_INPUT)); - addInput(Port::create<Port24>(attackInputPosition, Port::INPUT, module, AD::ATTACK_INPUT)); - addInput(Port::create<Port24>(decayInputPosition, Port::INPUT, module, AD::DECAY_INPUT)); + addInput(createPort<Port24>(triggerInputPosition, PortWidget::INPUT, module, AD::TRIGGER_INPUT)); + addInput(createPort<Port24>(attackInputPosition, PortWidget::INPUT, module, AD::ATTACK_INPUT)); + addInput(createPort<Port24>(decayInputPosition, PortWidget::INPUT, module, AD::DECAY_INPUT)); - addOutput(Port::create<Port24>(envOutputPosition, Port::OUTPUT, module, AD::ENV_OUTPUT)); - addOutput(Port::create<Port24>(eocOutputPosition, Port::OUTPUT, module, AD::EOC_OUTPUT)); + addOutput(createPort<Port24>(envOutputPosition, PortWidget::OUTPUT, module, AD::ENV_OUTPUT)); + addOutput(createPort<Port24>(eocOutputPosition, PortWidget::OUTPUT, module, AD::EOC_OUTPUT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(attackLightPosition, module, AD::ATTACK_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(decayLightPosition, module, AD::DECAY_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(loopLightPosition, module, AD::LOOP_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(linearLightPosition, module, AD::LINEAR_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(attackLightPosition, module, AD::ATTACK_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(decayLightPosition, module, AD::DECAY_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(loopLightPosition, module, AD::LOOP_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(linearLightPosition, module, AD::LINEAR_LIGHT)); } }; diff --git a/src/ADSR.cpp b/src/ADSR.cpp @@ -52,8 +52,8 @@ struct ADSRWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto attackParamPosition = Vec(8.0, 33.0); @@ -73,21 +73,21 @@ struct ADSRWidget : ModuleWidget { auto linearLightPosition = Vec(4.0, 247.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob29>(attackParamPosition, module, ADSR::ATTACK_PARAM, 0.0, 1.0, 0.12)); - addParam(ParamWidget::create<Knob29>(decayParamPosition, module, ADSR::DECAY_PARAM, 0.0, 1.0, 0.31623)); - addParam(ParamWidget::create<Knob29>(sustainParamPosition, module, ADSR::SUSTAIN_PARAM, 0.0, 1.0, 1.0)); - addParam(ParamWidget::create<Knob29>(releaseParamPosition, module, ADSR::RELEASE_PARAM, 0.0, 1.0, 0.31623)); - addParam(ParamWidget::create<StatefulButton9>(linearParamPosition, module, ADSR::LINEAR_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<Knob29>(attackParamPosition, module, ADSR::ATTACK_PARAM, 0.0, 1.0, 0.12)); + addParam(createParam<Knob29>(decayParamPosition, module, ADSR::DECAY_PARAM, 0.0, 1.0, 0.31623)); + addParam(createParam<Knob29>(sustainParamPosition, module, ADSR::SUSTAIN_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<Knob29>(releaseParamPosition, module, ADSR::RELEASE_PARAM, 0.0, 1.0, 0.31623)); + addParam(createParam<StatefulButton9>(linearParamPosition, module, ADSR::LINEAR_PARAM, 0.0, 1.0, 0.0)); - addInput(Port::create<Port24>(gateInputPosition, Port::INPUT, module, ADSR::GATE_INPUT)); + addInput(createPort<Port24>(gateInputPosition, PortWidget::INPUT, module, ADSR::GATE_INPUT)); - addOutput(Port::create<Port24>(outOutputPosition, Port::OUTPUT, module, ADSR::OUT_OUTPUT)); + addOutput(createPort<Port24>(outOutputPosition, PortWidget::OUTPUT, module, ADSR::OUT_OUTPUT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(attackLightPosition, module, ADSR::ATTACK_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(decayLightPosition, module, ADSR::DECAY_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(sustainLightPosition, module, ADSR::SUSTAIN_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(releaseLightPosition, module, ADSR::RELEASE_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(linearLightPosition, module, ADSR::LINEAR_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(attackLightPosition, module, ADSR::ATTACK_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(decayLightPosition, module, ADSR::DECAY_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(sustainLightPosition, module, ADSR::SUSTAIN_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(releaseLightPosition, module, ADSR::RELEASE_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(linearLightPosition, module, ADSR::LINEAR_LIGHT)); } }; diff --git a/src/AMRM.cpp b/src/AMRM.cpp @@ -44,8 +44,8 @@ struct AMRMWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto rectifyParamPosition = Vec(22.5, 66.5); @@ -60,16 +60,16 @@ struct AMRMWidget : ModuleWidget { auto outOutputPosition = Vec(50.0, 320.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob45>(rectifyParamPosition, module, AMRM::RECTIFY_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob45>(drywetParamPosition, module, AMRM::DRYWET_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<Knob45>(rectifyParamPosition, module, AMRM::RECTIFY_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<Knob45>(drywetParamPosition, module, AMRM::DRYWET_PARAM, 0.0, 1.0, 1.0)); - addInput(Port::create<Port24>(modulatorInputPosition, Port::INPUT, module, AMRM::MODULATOR_INPUT)); - addInput(Port::create<Port24>(carrierInputPosition, Port::INPUT, module, AMRM::CARRIER_INPUT)); - addInput(Port::create<Port24>(rectifyInputPosition, Port::INPUT, module, AMRM::RECTIFY_INPUT)); - addInput(Port::create<Port24>(drywetInputPosition, Port::INPUT, module, AMRM::DRYWET_INPUT)); + addInput(createPort<Port24>(modulatorInputPosition, PortWidget::INPUT, module, AMRM::MODULATOR_INPUT)); + addInput(createPort<Port24>(carrierInputPosition, PortWidget::INPUT, module, AMRM::CARRIER_INPUT)); + addInput(createPort<Port24>(rectifyInputPosition, PortWidget::INPUT, module, AMRM::RECTIFY_INPUT)); + addInput(createPort<Port24>(drywetInputPosition, PortWidget::INPUT, module, AMRM::DRYWET_INPUT)); - addOutput(Port::create<Port24>(rectifyOutputPosition, Port::OUTPUT, module, AMRM::RECTIFY_OUTPUT)); - addOutput(Port::create<Port24>(outOutputPosition, Port::OUTPUT, module, AMRM::OUT_OUTPUT)); + addOutput(createPort<Port24>(rectifyOutputPosition, PortWidget::OUTPUT, module, AMRM::RECTIFY_OUTPUT)); + addOutput(createPort<Port24>(outOutputPosition, PortWidget::OUTPUT, module, AMRM::OUT_OUTPUT)); } }; diff --git a/src/Additator.cpp b/src/Additator.cpp @@ -158,10 +158,10 @@ struct AdditatorWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(15, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 0))); - addChild(Widget::create<ScrewSilver>(Vec(15, 365))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 365))); + addChild(createWidget<ScrewSilver>(Vec(15, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0))); + addChild(createWidget<ScrewSilver>(Vec(15, 365))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 365))); // generated by svg_widgets.rb auto frequencyParamPosition = Vec(40.0, 45.0); @@ -193,17 +193,17 @@ struct AdditatorWidget : ModuleWidget { auto cosineLightPosition = Vec(185.0, 287.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob68>(frequencyParamPosition, module, Additator::FREQUENCY_PARAM, -3.0, 6.0, 0.0)); + addParam(createParam<Knob68>(frequencyParamPosition, module, Additator::FREQUENCY_PARAM, -3.0, 6.0, 0.0)); { - auto w = ParamWidget::create<Knob38>(partialsParamPosition, module, Additator::PARTIALS_PARAM, 1.0, module->maxPartials, module->maxPartials / 5.0); + auto w = createParam<Knob38>(partialsParamPosition, module, Additator::PARTIALS_PARAM, 1.0, module->maxPartials, module->maxPartials / 5.0); dynamic_cast<Knob*>(w)->snap = true; addParam(w); } - addParam(ParamWidget::create<Knob16>(fineParamPosition, module, Additator::FINE_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob26>(widthParamPosition, module, Additator::WIDTH_PARAM, 0.0, module->maxWidth, module->maxWidth / 2.0)); - addParam(ParamWidget::create<Knob26>(oddSkewParamPosition, module, Additator::ODD_SKEW_PARAM, -module->maxSkew, module->maxSkew, 0.0)); - addParam(ParamWidget::create<Knob26>(evenSkewParamPosition, module, Additator::EVEN_SKEW_PARAM, -module->maxSkew, module->maxSkew, 0.0)); - addParam(ParamWidget::create<Knob26>( + addParam(createParam<Knob16>(fineParamPosition, module, Additator::FINE_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob26>(widthParamPosition, module, Additator::WIDTH_PARAM, 0.0, module->maxWidth, module->maxWidth / 2.0)); + addParam(createParam<Knob26>(oddSkewParamPosition, module, Additator::ODD_SKEW_PARAM, -module->maxSkew, module->maxSkew, 0.0)); + addParam(createParam<Knob26>(evenSkewParamPosition, module, Additator::EVEN_SKEW_PARAM, -module->maxSkew, module->maxSkew, 0.0)); + addParam(createParam<Knob26>( gainParamPosition, module, Additator::GAIN_PARAM, @@ -211,7 +211,7 @@ struct AdditatorWidget : ModuleWidget { module->maxAmplitudeNormalization, (module->maxAmplitudeNormalization - module->minAmplitudeNormalization) / 2.0 + module->minAmplitudeNormalization )); - addParam(ParamWidget::create<Knob26>( + addParam(createParam<Knob26>( decayParamPosition, module, Additator::DECAY_PARAM, @@ -219,8 +219,8 @@ struct AdditatorWidget : ModuleWidget { module->maxDecay, (module->maxDecay - module->minDecay) / 2.0 + module->minDecay )); - addParam(ParamWidget::create<Knob26>(balanceParamPosition, module, Additator::BALANCE_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob26>( + addParam(createParam<Knob26>(balanceParamPosition, module, Additator::BALANCE_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob26>( filterParamPosition, module, Additator::FILTER_PARAM, @@ -228,23 +228,23 @@ struct AdditatorWidget : ModuleWidget { module->maxFilter, (module->maxFilter - module->minFilter) / 2.0 + module->minFilter )); - addParam(ParamWidget::create<StatefulButton9>(phaseParamPosition, module, Additator::PHASE_PARAM, 1.0, 2.0, 1.0)); - - addInput(Port::create<Port24>(partialsInputPosition, Port::INPUT, module, Additator::PARTIALS_INPUT)); - addInput(Port::create<Port24>(widthInputPosition, Port::INPUT, module, Additator::WIDTH_INPUT)); - addInput(Port::create<Port24>(oddSkewInputPosition, Port::INPUT, module, Additator::ODD_SKEW_INPUT)); - addInput(Port::create<Port24>(evenSkewInputPosition, Port::INPUT, module, Additator::EVEN_SKEW_INPUT)); - addInput(Port::create<Port24>(gainInputPosition, Port::INPUT, module, Additator::GAIN_INPUT)); - addInput(Port::create<Port24>(decayInputPosition, Port::INPUT, module, Additator::DECAY_INPUT)); - addInput(Port::create<Port24>(balanceInputPosition, Port::INPUT, module, Additator::BALANCE_INPUT)); - addInput(Port::create<Port24>(filterInputPosition, Port::INPUT, module, Additator::FILTER_INPUT)); - addInput(Port::create<Port24>(pitchInputPosition, Port::INPUT, module, Additator::PITCH_INPUT)); - addInput(Port::create<Port24>(syncInputPosition, Port::INPUT, module, Additator::SYNC_INPUT)); - - addOutput(Port::create<Port24>(audioOutputPosition, Port::OUTPUT, module, Additator::AUDIO_OUTPUT)); - - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(sineLightPosition, module, Additator::SINE_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(cosineLightPosition, module, Additator::COSINE_LIGHT)); + addParam(createParam<StatefulButton9>(phaseParamPosition, module, Additator::PHASE_PARAM, 1.0, 2.0, 1.0)); + + addInput(createPort<Port24>(partialsInputPosition, PortWidget::INPUT, module, Additator::PARTIALS_INPUT)); + addInput(createPort<Port24>(widthInputPosition, PortWidget::INPUT, module, Additator::WIDTH_INPUT)); + addInput(createPort<Port24>(oddSkewInputPosition, PortWidget::INPUT, module, Additator::ODD_SKEW_INPUT)); + addInput(createPort<Port24>(evenSkewInputPosition, PortWidget::INPUT, module, Additator::EVEN_SKEW_INPUT)); + addInput(createPort<Port24>(gainInputPosition, PortWidget::INPUT, module, Additator::GAIN_INPUT)); + addInput(createPort<Port24>(decayInputPosition, PortWidget::INPUT, module, Additator::DECAY_INPUT)); + addInput(createPort<Port24>(balanceInputPosition, PortWidget::INPUT, module, Additator::BALANCE_INPUT)); + addInput(createPort<Port24>(filterInputPosition, PortWidget::INPUT, module, Additator::FILTER_INPUT)); + addInput(createPort<Port24>(pitchInputPosition, PortWidget::INPUT, module, Additator::PITCH_INPUT)); + addInput(createPort<Port24>(syncInputPosition, PortWidget::INPUT, module, Additator::SYNC_INPUT)); + + addOutput(createPort<Port24>(audioOutputPosition, PortWidget::OUTPUT, module, Additator::AUDIO_OUTPUT)); + + addChild(createLight<SmallLight<GreenLight>>(sineLightPosition, module, Additator::SINE_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(cosineLightPosition, module, Additator::COSINE_LIGHT)); } }; diff --git a/src/AddrSeq.cpp b/src/AddrSeq.cpp @@ -86,8 +86,8 @@ struct AddrSeqWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto stepsParamPosition = Vec(15.5, 131.5); @@ -119,39 +119,39 @@ struct AddrSeqWidget : ModuleWidget { // end generated by svg_widgets.rb { - auto w = ParamWidget::create<Knob16>(stepsParamPosition, module, AddrSeq::STEPS_PARAM, 1.0, 8.0, 8.0); + auto w = createParam<Knob16>(stepsParamPosition, module, AddrSeq::STEPS_PARAM, 1.0, 8.0, 8.0); dynamic_cast<Knob*>(w)->snap = true; addParam(w); } - addParam(ParamWidget::create<SliderSwitch2State14>(directionParamPosition, module, AddrSeq::DIRECTION_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<SliderSwitch2State14>(directionParamPosition, module, AddrSeq::DIRECTION_PARAM, 0.0, 1.0, 1.0)); { - auto w = ParamWidget::create<Knob29>(selectParamPosition, module, AddrSeq::SELECT_PARAM, 0.0, 7.0, 0.0); + auto w = createParam<Knob29>(selectParamPosition, module, AddrSeq::SELECT_PARAM, 0.0, 7.0, 0.0); dynamic_cast<Knob*>(w)->snap = true; addParam(w); } - addParam(ParamWidget::create<Knob16>(out1ParamPosition, module, AddrSeq::OUT1_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob16>(out2ParamPosition, module, AddrSeq::OUT2_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob16>(out3ParamPosition, module, AddrSeq::OUT3_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob16>(out4ParamPosition, module, AddrSeq::OUT4_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob16>(out5ParamPosition, module, AddrSeq::OUT5_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob16>(out6ParamPosition, module, AddrSeq::OUT6_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob16>(out7ParamPosition, module, AddrSeq::OUT7_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob16>(out8ParamPosition, module, AddrSeq::OUT8_PARAM, -1.0, 1.0, 0.0)); - - addInput(Port::create<Port24>(clockInputPosition, Port::INPUT, module, AddrSeq::CLOCK_INPUT)); - addInput(Port::create<Port24>(resetInputPosition, Port::INPUT, module, AddrSeq::RESET_INPUT)); - addInput(Port::create<Port24>(selectInputPosition, Port::INPUT, module, AddrSeq::SELECT_INPUT)); - - addOutput(Port::create<Port24>(outOutputPosition, Port::OUTPUT, module, AddrSeq::OUT_OUTPUT)); - - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(out1LightPosition, module, AddrSeq::OUT1_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(out2LightPosition, module, AddrSeq::OUT2_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(out3LightPosition, module, AddrSeq::OUT3_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(out4LightPosition, module, AddrSeq::OUT4_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(out5LightPosition, module, AddrSeq::OUT5_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(out6LightPosition, module, AddrSeq::OUT6_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(out7LightPosition, module, AddrSeq::OUT7_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(out8LightPosition, module, AddrSeq::OUT8_LIGHT)); + addParam(createParam<Knob16>(out1ParamPosition, module, AddrSeq::OUT1_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob16>(out2ParamPosition, module, AddrSeq::OUT2_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob16>(out3ParamPosition, module, AddrSeq::OUT3_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob16>(out4ParamPosition, module, AddrSeq::OUT4_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob16>(out5ParamPosition, module, AddrSeq::OUT5_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob16>(out6ParamPosition, module, AddrSeq::OUT6_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob16>(out7ParamPosition, module, AddrSeq::OUT7_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob16>(out8ParamPosition, module, AddrSeq::OUT8_PARAM, -1.0, 1.0, 0.0)); + + addInput(createPort<Port24>(clockInputPosition, PortWidget::INPUT, module, AddrSeq::CLOCK_INPUT)); + addInput(createPort<Port24>(resetInputPosition, PortWidget::INPUT, module, AddrSeq::RESET_INPUT)); + addInput(createPort<Port24>(selectInputPosition, PortWidget::INPUT, module, AddrSeq::SELECT_INPUT)); + + addOutput(createPort<Port24>(outOutputPosition, PortWidget::OUTPUT, module, AddrSeq::OUT_OUTPUT)); + + addChild(createLight<SmallLight<GreenLight>>(out1LightPosition, module, AddrSeq::OUT1_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(out2LightPosition, module, AddrSeq::OUT2_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(out3LightPosition, module, AddrSeq::OUT3_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(out4LightPosition, module, AddrSeq::OUT4_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(out5LightPosition, module, AddrSeq::OUT5_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(out6LightPosition, module, AddrSeq::OUT6_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(out7LightPosition, module, AddrSeq::OUT7_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(out8LightPosition, module, AddrSeq::OUT8_LIGHT)); } void appendContextMenu(Menu* menu) override { diff --git a/src/Analyzer.cpp b/src/Analyzer.cpp @@ -123,10 +123,10 @@ struct AnalyzerWidget : ModuleWidget { addChild(display); } - addChild(Widget::create<ScrewSilver>(Vec(15, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 0))); - addChild(Widget::create<ScrewSilver>(Vec(15, 365))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 365))); + addChild(createWidget<ScrewSilver>(Vec(15, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0))); + addChild(createWidget<ScrewSilver>(Vec(15, 365))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 365))); // generated by svg_widgets.rb auto range2ParamPosition = Vec(30.08, 271.08); @@ -152,27 +152,27 @@ struct AnalyzerWidget : ModuleWidget { auto windowKaiserLightPosition = Vec(241.0, 295.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob38>(range2ParamPosition, module, Analyzer::RANGE2_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob38>(smoothParamPosition, module, Analyzer::SMOOTH_PARAM, 0.0, 1.0, 0.5)); - addParam(ParamWidget::create<StatefulButton9>(qualityParamPosition, module, Analyzer::QUALITY_PARAM, 1.0, 3.0, 1.0)); - addParam(ParamWidget::create<StatefulButton9>(windowParamPosition, module, Analyzer::WINDOW_PARAM, 1.0, 3.0, 1.0)); - - addInput(Port::create<Port24>(signalaInputPosition, Port::INPUT, module, Analyzer::SIGNALA_INPUT)); - addInput(Port::create<Port24>(signalbInputPosition, Port::INPUT, module, Analyzer::SIGNALB_INPUT)); - addInput(Port::create<Port24>(signalcInputPosition, Port::INPUT, module, Analyzer::SIGNALC_INPUT)); - addInput(Port::create<Port24>(signaldInputPosition, Port::INPUT, module, Analyzer::SIGNALD_INPUT)); - - addOutput(Port::create<Port24>(signalaOutputPosition, Port::OUTPUT, module, Analyzer::SIGNALA_OUTPUT)); - addOutput(Port::create<Port24>(signalbOutputPosition, Port::OUTPUT, module, Analyzer::SIGNALB_OUTPUT)); - addOutput(Port::create<Port24>(signalcOutputPosition, Port::OUTPUT, module, Analyzer::SIGNALC_OUTPUT)); - addOutput(Port::create<Port24>(signaldOutputPosition, Port::OUTPUT, module, Analyzer::SIGNALD_OUTPUT)); - - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(qualityUltraLightPosition, module, Analyzer::QUALITY_ULTRA_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(qualityHighLightPosition, module, Analyzer::QUALITY_HIGH_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(qualityGoodLightPosition, module, Analyzer::QUALITY_GOOD_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(windowNoneLightPosition, module, Analyzer::WINDOW_NONE_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(windowHammingLightPosition, module, Analyzer::WINDOW_HAMMING_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(windowKaiserLightPosition, module, Analyzer::WINDOW_KAISER_LIGHT)); + addParam(createParam<Knob38>(range2ParamPosition, module, Analyzer::RANGE2_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob38>(smoothParamPosition, module, Analyzer::SMOOTH_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam<StatefulButton9>(qualityParamPosition, module, Analyzer::QUALITY_PARAM, 1.0, 3.0, 1.0)); + addParam(createParam<StatefulButton9>(windowParamPosition, module, Analyzer::WINDOW_PARAM, 1.0, 3.0, 1.0)); + + addInput(createPort<Port24>(signalaInputPosition, PortWidget::INPUT, module, Analyzer::SIGNALA_INPUT)); + addInput(createPort<Port24>(signalbInputPosition, PortWidget::INPUT, module, Analyzer::SIGNALB_INPUT)); + addInput(createPort<Port24>(signalcInputPosition, PortWidget::INPUT, module, Analyzer::SIGNALC_INPUT)); + addInput(createPort<Port24>(signaldInputPosition, PortWidget::INPUT, module, Analyzer::SIGNALD_INPUT)); + + addOutput(createPort<Port24>(signalaOutputPosition, PortWidget::OUTPUT, module, Analyzer::SIGNALA_OUTPUT)); + addOutput(createPort<Port24>(signalbOutputPosition, PortWidget::OUTPUT, module, Analyzer::SIGNALB_OUTPUT)); + addOutput(createPort<Port24>(signalcOutputPosition, PortWidget::OUTPUT, module, Analyzer::SIGNALC_OUTPUT)); + addOutput(createPort<Port24>(signaldOutputPosition, PortWidget::OUTPUT, module, Analyzer::SIGNALD_OUTPUT)); + + addChild(createLight<SmallLight<GreenLight>>(qualityUltraLightPosition, module, Analyzer::QUALITY_ULTRA_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(qualityHighLightPosition, module, Analyzer::QUALITY_HIGH_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(qualityGoodLightPosition, module, Analyzer::QUALITY_GOOD_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(windowNoneLightPosition, module, Analyzer::WINDOW_NONE_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(windowHammingLightPosition, module, Analyzer::WINDOW_HAMMING_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(windowKaiserLightPosition, module, Analyzer::WINDOW_KAISER_LIGHT)); } void appendContextMenu(Menu* menu) override { diff --git a/src/AnalyzerXL.cpp b/src/AnalyzerXL.cpp @@ -272,14 +272,14 @@ struct AnalyzerXLWidget : ModuleWidget { auto signalhInputPosition = Vec(3.0, 251.0); // end generated by svg_widgets.rb - addInput(Port::create<Port24>(signalaInputPosition, Port::INPUT, module, AnalyzerXL::SIGNALA_INPUT)); - addInput(Port::create<Port24>(signalbInputPosition, Port::INPUT, module, AnalyzerXL::SIGNALB_INPUT)); - addInput(Port::create<Port24>(signalcInputPosition, Port::INPUT, module, AnalyzerXL::SIGNALC_INPUT)); - addInput(Port::create<Port24>(signaldInputPosition, Port::INPUT, module, AnalyzerXL::SIGNALD_INPUT)); - addInput(Port::create<Port24>(signaleInputPosition, Port::INPUT, module, AnalyzerXL::SIGNALE_INPUT)); - addInput(Port::create<Port24>(signalfInputPosition, Port::INPUT, module, AnalyzerXL::SIGNALF_INPUT)); - addInput(Port::create<Port24>(signalgInputPosition, Port::INPUT, module, AnalyzerXL::SIGNALG_INPUT)); - addInput(Port::create<Port24>(signalhInputPosition, Port::INPUT, module, AnalyzerXL::SIGNALH_INPUT)); + addInput(createPort<Port24>(signalaInputPosition, PortWidget::INPUT, module, AnalyzerXL::SIGNALA_INPUT)); + addInput(createPort<Port24>(signalbInputPosition, PortWidget::INPUT, module, AnalyzerXL::SIGNALB_INPUT)); + addInput(createPort<Port24>(signalcInputPosition, PortWidget::INPUT, module, AnalyzerXL::SIGNALC_INPUT)); + addInput(createPort<Port24>(signaldInputPosition, PortWidget::INPUT, module, AnalyzerXL::SIGNALD_INPUT)); + addInput(createPort<Port24>(signaleInputPosition, PortWidget::INPUT, module, AnalyzerXL::SIGNALE_INPUT)); + addInput(createPort<Port24>(signalfInputPosition, PortWidget::INPUT, module, AnalyzerXL::SIGNALF_INPUT)); + addInput(createPort<Port24>(signalgInputPosition, PortWidget::INPUT, module, AnalyzerXL::SIGNALG_INPUT)); + addInput(createPort<Port24>(signalhInputPosition, PortWidget::INPUT, module, AnalyzerXL::SIGNALH_INPUT)); } void appendContextMenu(Menu* menu) override { diff --git a/src/Blank3.cpp b/src/Blank3.cpp @@ -79,10 +79,10 @@ struct Blank3Widget : ModuleWidget { addChild(display); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); - addInput(Port::create<BlankPort24>(Vec(10.5, 346), Port::INPUT, module, Blank3::IN_INPUT)); + addInput(createPort<BlankPort24>(Vec(10.5, 346), PortWidget::INPUT, module, Blank3::IN_INPUT)); } }; diff --git a/src/Blank6.cpp b/src/Blank6.cpp @@ -79,10 +79,10 @@ struct Blank6Widget : ModuleWidget { addChild(display); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); - addInput(Port::create<BlankPort24>(Vec(33, 346), Port::INPUT, module, Blank6::IN_INPUT)); + addInput(createPort<BlankPort24>(Vec(33, 346), PortWidget::INPUT, module, Blank6::IN_INPUT)); } }; diff --git a/src/Bool.cpp b/src/Bool.cpp @@ -24,8 +24,8 @@ struct BoolWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto aInputPosition = Vec(10.5, 23.0); @@ -38,14 +38,14 @@ struct BoolWidget : ModuleWidget { auto notOutputPosition = Vec(10.5, 254.0); // end generated by svg_widgets.rb - addInput(Port::create<Port24>(aInputPosition, Port::INPUT, module, Bool::A_INPUT)); - addInput(Port::create<Port24>(bInputPosition, Port::INPUT, module, Bool::B_INPUT)); - addInput(Port::create<Port24>(notInputPosition, Port::INPUT, module, Bool::NOT_INPUT)); + addInput(createPort<Port24>(aInputPosition, PortWidget::INPUT, module, Bool::A_INPUT)); + addInput(createPort<Port24>(bInputPosition, PortWidget::INPUT, module, Bool::B_INPUT)); + addInput(createPort<Port24>(notInputPosition, PortWidget::INPUT, module, Bool::NOT_INPUT)); - addOutput(Port::create<Port24>(andOutputPosition, Port::OUTPUT, module, Bool::AND_OUTPUT)); - addOutput(Port::create<Port24>(orOutputPosition, Port::OUTPUT, module, Bool::OR_OUTPUT)); - addOutput(Port::create<Port24>(xorOutputPosition, Port::OUTPUT, module, Bool::XOR_OUTPUT)); - addOutput(Port::create<Port24>(notOutputPosition, Port::OUTPUT, module, Bool::NOT_OUTPUT)); + addOutput(createPort<Port24>(andOutputPosition, PortWidget::OUTPUT, module, Bool::AND_OUTPUT)); + addOutput(createPort<Port24>(orOutputPosition, PortWidget::OUTPUT, module, Bool::OR_OUTPUT)); + addOutput(createPort<Port24>(xorOutputPosition, PortWidget::OUTPUT, module, Bool::XOR_OUTPUT)); + addOutput(createPort<Port24>(notOutputPosition, PortWidget::OUTPUT, module, Bool::NOT_OUTPUT)); } }; diff --git a/src/CVD.cpp b/src/CVD.cpp @@ -46,8 +46,8 @@ struct CVDWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto timeParamPosition = Vec(8.0, 36.0); @@ -61,9 +61,9 @@ struct CVDWidget : ModuleWidget { auto outOutputPosition = Vec(10.5, 305.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob29>(timeParamPosition, module, CVD::TIME_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam<Knob29>(timeParamPosition, module, CVD::TIME_PARAM, 0.0, 1.0, 0.5)); { - auto w = ParamWidget::create<Knob16>(timeScaleParamPosition, module, CVD::TIME_SCALE_PARAM, 0.0, 2.0, 1.0); + auto w = createParam<Knob16>(timeScaleParamPosition, module, CVD::TIME_SCALE_PARAM, 0.0, 2.0, 1.0); auto k = dynamic_cast<SVGKnob*>(w); k->snap = true; k->minAngle = -M_PI / 4.0f; @@ -71,13 +71,13 @@ struct CVDWidget : ModuleWidget { k->speed = 3.0; addParam(w); } - addParam(ParamWidget::create<Knob29>(mixParamPosition, module, CVD::MIX_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob29>(mixParamPosition, module, CVD::MIX_PARAM, -1.0, 1.0, 0.0)); - addInput(Port::create<Port24>(timeInputPosition, Port::INPUT, module, CVD::TIME_INPUT)); - addInput(Port::create<Port24>(mixInputPosition, Port::INPUT, module, CVD::MIX_INPUT)); - addInput(Port::create<Port24>(inInputPosition, Port::INPUT, module, CVD::IN_INPUT)); + addInput(createPort<Port24>(timeInputPosition, PortWidget::INPUT, module, CVD::TIME_INPUT)); + addInput(createPort<Port24>(mixInputPosition, PortWidget::INPUT, module, CVD::MIX_INPUT)); + addInput(createPort<Port24>(inInputPosition, PortWidget::INPUT, module, CVD::IN_INPUT)); - addOutput(Port::create<Port24>(outOutputPosition, Port::OUTPUT, module, CVD::OUT_OUTPUT)); + addOutput(createPort<Port24>(outOutputPosition, PortWidget::OUTPUT, module, CVD::OUT_OUTPUT)); } }; diff --git a/src/Clpr.cpp b/src/Clpr.cpp @@ -61,8 +61,8 @@ struct ClprWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto thresholdParamPosition = Vec(26.0, 52.0); @@ -78,17 +78,17 @@ struct ClprWidget : ModuleWidget { auto rightOutputPosition = Vec(50.0, 320.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob38>(thresholdParamPosition, module, Clpr::THRESHOLD_PARAM, 0.0, 1.0, 0.8)); - addParam(ParamWidget::create<Knob38>(outputGainParamPosition, module, Clpr::OUTPUT_GAIN_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<SliderSwitch2State14>(kneeParamPosition, module, Clpr::KNEE_PARAM, 0.95, 1.0, 0.0)); + addParam(createParam<Knob38>(thresholdParamPosition, module, Clpr::THRESHOLD_PARAM, 0.0, 1.0, 0.8)); + addParam(createParam<Knob38>(outputGainParamPosition, module, Clpr::OUTPUT_GAIN_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<SliderSwitch2State14>(kneeParamPosition, module, Clpr::KNEE_PARAM, 0.95, 1.0, 0.0)); - addInput(Port::create<Port24>(leftInputPosition, Port::INPUT, module, Clpr::LEFT_INPUT)); - addInput(Port::create<Port24>(rightInputPosition, Port::INPUT, module, Clpr::RIGHT_INPUT)); - addInput(Port::create<Port24>(thresholdInputPosition, Port::INPUT, module, Clpr::THRESHOLD_INPUT)); - addInput(Port::create<Port24>(outputGainInputPosition, Port::INPUT, module, Clpr::OUTPUT_GAIN_INPUT)); + addInput(createPort<Port24>(leftInputPosition, PortWidget::INPUT, module, Clpr::LEFT_INPUT)); + addInput(createPort<Port24>(rightInputPosition, PortWidget::INPUT, module, Clpr::RIGHT_INPUT)); + addInput(createPort<Port24>(thresholdInputPosition, PortWidget::INPUT, module, Clpr::THRESHOLD_INPUT)); + addInput(createPort<Port24>(outputGainInputPosition, PortWidget::INPUT, module, Clpr::OUTPUT_GAIN_INPUT)); - addOutput(Port::create<Port24>(leftOutputPosition, Port::OUTPUT, module, Clpr::LEFT_OUTPUT)); - addOutput(Port::create<Port24>(rightOutputPosition, Port::OUTPUT, module, Clpr::RIGHT_OUTPUT)); + addOutput(createPort<Port24>(leftOutputPosition, PortWidget::OUTPUT, module, Clpr::LEFT_OUTPUT)); + addOutput(createPort<Port24>(rightOutputPosition, PortWidget::OUTPUT, module, Clpr::RIGHT_OUTPUT)); } }; diff --git a/src/Cmp.cpp b/src/Cmp.cpp @@ -166,8 +166,8 @@ struct CmpWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto aParamPosition = Vec(8.0, 46.0); @@ -187,12 +187,12 @@ struct CmpWidget : ModuleWidget { auto notEqualOutputPosition = Vec(50.0, 319.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob29>(aParamPosition, module, Cmp::A_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob29>(bParamPosition, module, Cmp::B_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob29>(windowParamPosition, module, Cmp::WINDOW_PARAM, 0.0, 1.0, 0.5)); - addParam(ParamWidget::create<Knob29>(lagParamPosition, module, Cmp::LAG_PARAM, 0.0, 1.0, 0.1)); + addParam(createParam<Knob29>(aParamPosition, module, Cmp::A_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob29>(bParamPosition, module, Cmp::B_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob29>(windowParamPosition, module, Cmp::WINDOW_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam<Knob29>(lagParamPosition, module, Cmp::LAG_PARAM, 0.0, 1.0, 0.1)); { - auto w = ParamWidget::create<Knob16>(outputParamPosition, module, Cmp::OUTPUT_PARAM, 0.0, 1.0, 0.0); + auto w = createParam<Knob16>(outputParamPosition, module, Cmp::OUTPUT_PARAM, 0.0, 1.0, 0.0); auto k = dynamic_cast<SVGKnob*>(w); k->snap = true; k->minAngle = 3.0f * (M_PI / 8.0f); @@ -201,15 +201,15 @@ struct CmpWidget : ModuleWidget { addParam(w); } - addInput(Port::create<Port24>(aInputPosition, Port::INPUT, module, Cmp::A_INPUT)); - addInput(Port::create<Port24>(bInputPosition, Port::INPUT, module, Cmp::B_INPUT)); - addInput(Port::create<Port24>(windowInputPosition, Port::INPUT, module, Cmp::WINDOW_INPUT)); - addInput(Port::create<Port24>(lagInputPosition, Port::INPUT, module, Cmp::LAG_INPUT)); + addInput(createPort<Port24>(aInputPosition, PortWidget::INPUT, module, Cmp::A_INPUT)); + addInput(createPort<Port24>(bInputPosition, PortWidget::INPUT, module, Cmp::B_INPUT)); + addInput(createPort<Port24>(windowInputPosition, PortWidget::INPUT, module, Cmp::WINDOW_INPUT)); + addInput(createPort<Port24>(lagInputPosition, PortWidget::INPUT, module, Cmp::LAG_INPUT)); - addOutput(Port::create<Port24>(greaterOutputPosition, Port::OUTPUT, module, Cmp::GREATER_OUTPUT)); - addOutput(Port::create<Port24>(lessOutputPosition, Port::OUTPUT, module, Cmp::LESS_OUTPUT)); - addOutput(Port::create<Port24>(equalOutputPosition, Port::OUTPUT, module, Cmp::EQUAL_OUTPUT)); - addOutput(Port::create<Port24>(notEqualOutputPosition, Port::OUTPUT, module, Cmp::NOT_EQUAL_OUTPUT)); + addOutput(createPort<Port24>(greaterOutputPosition, PortWidget::OUTPUT, module, Cmp::GREATER_OUTPUT)); + addOutput(createPort<Port24>(lessOutputPosition, PortWidget::OUTPUT, module, Cmp::LESS_OUTPUT)); + addOutput(createPort<Port24>(equalOutputPosition, PortWidget::OUTPUT, module, Cmp::EQUAL_OUTPUT)); + addOutput(createPort<Port24>(notEqualOutputPosition, PortWidget::OUTPUT, module, Cmp::NOT_EQUAL_OUTPUT)); } }; diff --git a/src/DADSRH.cpp b/src/DADSRH.cpp @@ -14,10 +14,10 @@ struct DADSRHWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 0))); - addChild(Widget::create<ScrewSilver>(Vec(0, 365))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 0))); + addChild(createWidget<ScrewSilver>(Vec(0, 365))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto delayParamPosition = Vec(27.08, 33.08); @@ -57,41 +57,41 @@ struct DADSRHWidget : ModuleWidget { auto releaseShape3LightPosition = Vec(77.0, 284.5); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob38>(delayParamPosition, module, DADSRH::DELAY_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob38>(attackParamPosition, module, DADSRH::ATTACK_PARAM, 0.0, 1.0, 0.12)); - addParam(ParamWidget::create<Knob38>(decayParamPosition, module, DADSRH::DECAY_PARAM, 0.0, 1.0, 0.32)); - addParam(ParamWidget::create<Knob38>(sustainParamPosition, module, DADSRH::SUSTAIN_PARAM, 0.0, 1.0, 0.5)); - addParam(ParamWidget::create<Knob38>(releaseParamPosition, module, DADSRH::RELEASE_PARAM, 0.0, 1.0, 0.32)); - addParam(ParamWidget::create<Knob38>(holdParamPosition, module, DADSRH::HOLD_PARAM, 0.0, 1.0, 0.45)); - addParam(ParamWidget::create<StatefulButton9>(attackShapeParamPosition, module, DADSRH::ATTACK_SHAPE_PARAM, 1.0, 3.0, 1.0)); - addParam(ParamWidget::create<StatefulButton9>(decayShapeParamPosition, module, DADSRH::DECAY_SHAPE_PARAM, 1.0, 3.0, 1.0)); - addParam(ParamWidget::create<StatefulButton9>(releaseShapeParamPosition, module, DADSRH::RELEASE_SHAPE_PARAM, 1.0, 3.0, 1.0)); - addParam(ParamWidget::create<Button18>(triggerParamPosition, module, DADSRH::TRIGGER_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<SliderSwitch2State14>(modeParamPosition, module, DADSRH::MODE_PARAM, 0.0, 1.0, 1.0)); - addParam(ParamWidget::create<SliderSwitch2State14>(loopParamPosition, module, DADSRH::LOOP_PARAM, 0.0, 1.0, 1.0)); - addParam(ParamWidget::create<SliderSwitch2State14>(speedParamPosition, module, DADSRH::SPEED_PARAM, 0.0, 1.0, 1.0)); - addParam(ParamWidget::create<SliderSwitch2State14>(retriggerParamPosition, module, DADSRH::RETRIGGER_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<Knob38>(delayParamPosition, module, DADSRH::DELAY_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<Knob38>(attackParamPosition, module, DADSRH::ATTACK_PARAM, 0.0, 1.0, 0.12)); + addParam(createParam<Knob38>(decayParamPosition, module, DADSRH::DECAY_PARAM, 0.0, 1.0, 0.32)); + addParam(createParam<Knob38>(sustainParamPosition, module, DADSRH::SUSTAIN_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam<Knob38>(releaseParamPosition, module, DADSRH::RELEASE_PARAM, 0.0, 1.0, 0.32)); + addParam(createParam<Knob38>(holdParamPosition, module, DADSRH::HOLD_PARAM, 0.0, 1.0, 0.45)); + addParam(createParam<StatefulButton9>(attackShapeParamPosition, module, DADSRH::ATTACK_SHAPE_PARAM, 1.0, 3.0, 1.0)); + addParam(createParam<StatefulButton9>(decayShapeParamPosition, module, DADSRH::DECAY_SHAPE_PARAM, 1.0, 3.0, 1.0)); + addParam(createParam<StatefulButton9>(releaseShapeParamPosition, module, DADSRH::RELEASE_SHAPE_PARAM, 1.0, 3.0, 1.0)); + addParam(createParam<Button18>(triggerParamPosition, module, DADSRH::TRIGGER_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<SliderSwitch2State14>(modeParamPosition, module, DADSRH::MODE_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<SliderSwitch2State14>(loopParamPosition, module, DADSRH::LOOP_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<SliderSwitch2State14>(speedParamPosition, module, DADSRH::SPEED_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<SliderSwitch2State14>(retriggerParamPosition, module, DADSRH::RETRIGGER_PARAM, 0.0, 1.0, 1.0)); - addInput(Port::create<Port24>(triggerInputPosition, Port::INPUT, module, DADSRH::TRIGGER_INPUT)); + addInput(createPort<Port24>(triggerInputPosition, PortWidget::INPUT, module, DADSRH::TRIGGER_INPUT)); - addOutput(Port::create<Port24>(envOutputPosition, Port::OUTPUT, module, DADSRH::ENV_OUTPUT)); - addOutput(Port::create<Port24>(invOutputPosition, Port::OUTPUT, module, DADSRH::INV_OUTPUT)); - addOutput(Port::create<Port24>(triggerOutputPosition, Port::OUTPUT, module, DADSRH::TRIGGER_OUTPUT)); + addOutput(createPort<Port24>(envOutputPosition, PortWidget::OUTPUT, module, DADSRH::ENV_OUTPUT)); + addOutput(createPort<Port24>(invOutputPosition, PortWidget::OUTPUT, module, DADSRH::INV_OUTPUT)); + addOutput(createPort<Port24>(triggerOutputPosition, PortWidget::OUTPUT, module, DADSRH::TRIGGER_OUTPUT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(delayLightPosition, module, DADSRH::DELAY_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(attackLightPosition, module, DADSRH::ATTACK_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(decayLightPosition, module, DADSRH::DECAY_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(sustainLightPosition, module, DADSRH::SUSTAIN_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(releaseLightPosition, module, DADSRH::RELEASE_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(attackShape1LightPosition, module, DADSRH::ATTACK_SHAPE1_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(attackShape2LightPosition, module, DADSRH::ATTACK_SHAPE2_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(attackShape3LightPosition, module, DADSRH::ATTACK_SHAPE3_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(decayShape1LightPosition, module, DADSRH::DECAY_SHAPE1_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(decayShape2LightPosition, module, DADSRH::DECAY_SHAPE2_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(decayShape3LightPosition, module, DADSRH::DECAY_SHAPE3_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(releaseShape1LightPosition, module, DADSRH::RELEASE_SHAPE1_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(releaseShape2LightPosition, module, DADSRH::RELEASE_SHAPE2_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(releaseShape3LightPosition, module, DADSRH::RELEASE_SHAPE3_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(delayLightPosition, module, DADSRH::DELAY_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(attackLightPosition, module, DADSRH::ATTACK_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(decayLightPosition, module, DADSRH::DECAY_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(sustainLightPosition, module, DADSRH::SUSTAIN_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(releaseLightPosition, module, DADSRH::RELEASE_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(attackShape1LightPosition, module, DADSRH::ATTACK_SHAPE1_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(attackShape2LightPosition, module, DADSRH::ATTACK_SHAPE2_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(attackShape3LightPosition, module, DADSRH::ATTACK_SHAPE3_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(decayShape1LightPosition, module, DADSRH::DECAY_SHAPE1_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(decayShape2LightPosition, module, DADSRH::DECAY_SHAPE2_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(decayShape3LightPosition, module, DADSRH::DECAY_SHAPE3_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(releaseShape1LightPosition, module, DADSRH::RELEASE_SHAPE1_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(releaseShape2LightPosition, module, DADSRH::RELEASE_SHAPE2_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(releaseShape3LightPosition, module, DADSRH::RELEASE_SHAPE3_LIGHT)); } void appendContextMenu(Menu* menu) override { diff --git a/src/DADSRHPlus.cpp b/src/DADSRHPlus.cpp @@ -14,10 +14,10 @@ struct DADSRHPlusWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(15, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 0))); - addChild(Widget::create<ScrewSilver>(Vec(15, 365))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 365))); + addChild(createWidget<ScrewSilver>(Vec(15, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0))); + addChild(createWidget<ScrewSilver>(Vec(15, 365))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 365))); // generated by svg_widgets.rb auto delayParamPosition = Vec(27.08, 33.08); @@ -68,52 +68,52 @@ struct DADSRHPlusWidget : ModuleWidget { auto releaseShape3LightPosition = Vec(77.0, 284.5); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob38>(delayParamPosition, module, DADSRHPlus::DELAY_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob38>(attackParamPosition, module, DADSRHPlus::ATTACK_PARAM, 0.0, 1.0, 0.12)); - addParam(ParamWidget::create<Knob38>(decayParamPosition, module, DADSRHPlus::DECAY_PARAM, 0.0, 1.0, 0.32)); - addParam(ParamWidget::create<Knob38>(sustainParamPosition, module, DADSRHPlus::SUSTAIN_PARAM, 0.0, 1.0, 0.5)); - addParam(ParamWidget::create<Knob38>(releaseParamPosition, module, DADSRHPlus::RELEASE_PARAM, 0.0, 1.0, 0.32)); - addParam(ParamWidget::create<Knob38>(holdParamPosition, module, DADSRHPlus::HOLD_PARAM, 0.0, 1.0, 0.45)); - addParam(ParamWidget::create<StatefulButton9>(attackShapeParamPosition, module, DADSRHPlus::ATTACK_SHAPE_PARAM, 1.0, 3.0, 1.0)); - addParam(ParamWidget::create<StatefulButton9>(decayShapeParamPosition, module, DADSRHPlus::DECAY_SHAPE_PARAM, 1.0, 3.0, 1.0)); - addParam(ParamWidget::create<StatefulButton9>(releaseShapeParamPosition, module, DADSRHPlus::RELEASE_SHAPE_PARAM, 1.0, 3.0, 1.0)); - addParam(ParamWidget::create<Button18>(triggerParamPosition, module, DADSRHPlus::TRIGGER_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<SliderSwitch2State14>(modeParamPosition, module, DADSRHPlus::MODE_PARAM, 0.0, 1.0, 1.0)); - addParam(ParamWidget::create<SliderSwitch2State14>(loopParamPosition, module, DADSRHPlus::LOOP_PARAM, 0.0, 1.0, 1.0)); - addParam(ParamWidget::create<SliderSwitch2State14>(speedParamPosition, module, DADSRHPlus::SPEED_PARAM, 0.0, 1.0, 1.0)); - addParam(ParamWidget::create<SliderSwitch2State14>(retriggerParamPosition, module, DADSRHPlus::RETRIGGER_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<Knob38>(delayParamPosition, module, DADSRHPlus::DELAY_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<Knob38>(attackParamPosition, module, DADSRHPlus::ATTACK_PARAM, 0.0, 1.0, 0.12)); + addParam(createParam<Knob38>(decayParamPosition, module, DADSRHPlus::DECAY_PARAM, 0.0, 1.0, 0.32)); + addParam(createParam<Knob38>(sustainParamPosition, module, DADSRHPlus::SUSTAIN_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam<Knob38>(releaseParamPosition, module, DADSRHPlus::RELEASE_PARAM, 0.0, 1.0, 0.32)); + addParam(createParam<Knob38>(holdParamPosition, module, DADSRHPlus::HOLD_PARAM, 0.0, 1.0, 0.45)); + addParam(createParam<StatefulButton9>(attackShapeParamPosition, module, DADSRHPlus::ATTACK_SHAPE_PARAM, 1.0, 3.0, 1.0)); + addParam(createParam<StatefulButton9>(decayShapeParamPosition, module, DADSRHPlus::DECAY_SHAPE_PARAM, 1.0, 3.0, 1.0)); + addParam(createParam<StatefulButton9>(releaseShapeParamPosition, module, DADSRHPlus::RELEASE_SHAPE_PARAM, 1.0, 3.0, 1.0)); + addParam(createParam<Button18>(triggerParamPosition, module, DADSRHPlus::TRIGGER_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<SliderSwitch2State14>(modeParamPosition, module, DADSRHPlus::MODE_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<SliderSwitch2State14>(loopParamPosition, module, DADSRHPlus::LOOP_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<SliderSwitch2State14>(speedParamPosition, module, DADSRHPlus::SPEED_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<SliderSwitch2State14>(retriggerParamPosition, module, DADSRHPlus::RETRIGGER_PARAM, 0.0, 1.0, 1.0)); - addInput(Port::create<Port24>(delayInputPosition, Port::INPUT, module, DADSRHPlus::DELAY_INPUT)); - addInput(Port::create<Port24>(attackInputPosition, Port::INPUT, module, DADSRHPlus::ATTACK_INPUT)); - addInput(Port::create<Port24>(decayInputPosition, Port::INPUT, module, DADSRHPlus::DECAY_INPUT)); - addInput(Port::create<Port24>(sustainInputPosition, Port::INPUT, module, DADSRHPlus::SUSTAIN_INPUT)); - addInput(Port::create<Port24>(releaseInputPosition, Port::INPUT, module, DADSRHPlus::RELEASE_INPUT)); - addInput(Port::create<Port24>(holdInputPosition, Port::INPUT, module, DADSRHPlus::HOLD_INPUT)); - addInput(Port::create<Port24>(triggerInputPosition, Port::INPUT, module, DADSRHPlus::TRIGGER_INPUT)); + addInput(createPort<Port24>(delayInputPosition, PortWidget::INPUT, module, DADSRHPlus::DELAY_INPUT)); + addInput(createPort<Port24>(attackInputPosition, PortWidget::INPUT, module, DADSRHPlus::ATTACK_INPUT)); + addInput(createPort<Port24>(decayInputPosition, PortWidget::INPUT, module, DADSRHPlus::DECAY_INPUT)); + addInput(createPort<Port24>(sustainInputPosition, PortWidget::INPUT, module, DADSRHPlus::SUSTAIN_INPUT)); + addInput(createPort<Port24>(releaseInputPosition, PortWidget::INPUT, module, DADSRHPlus::RELEASE_INPUT)); + addInput(createPort<Port24>(holdInputPosition, PortWidget::INPUT, module, DADSRHPlus::HOLD_INPUT)); + addInput(createPort<Port24>(triggerInputPosition, PortWidget::INPUT, module, DADSRHPlus::TRIGGER_INPUT)); - addOutput(Port::create<Port24>(delayOutputPosition, Port::OUTPUT, module, DADSRHPlus::DELAY_OUTPUT)); - addOutput(Port::create<Port24>(attackOutputPosition, Port::OUTPUT, module, DADSRHPlus::ATTACK_OUTPUT)); - addOutput(Port::create<Port24>(decayOutputPosition, Port::OUTPUT, module, DADSRHPlus::DECAY_OUTPUT)); - addOutput(Port::create<Port24>(sustainOutputPosition, Port::OUTPUT, module, DADSRHPlus::SUSTAIN_OUTPUT)); - addOutput(Port::create<Port24>(releaseOutputPosition, Port::OUTPUT, module, DADSRHPlus::RELEASE_OUTPUT)); - addOutput(Port::create<Port24>(envOutputPosition, Port::OUTPUT, module, DADSRHPlus::ENV_OUTPUT)); - addOutput(Port::create<Port24>(invOutputPosition, Port::OUTPUT, module, DADSRHPlus::INV_OUTPUT)); - addOutput(Port::create<Port24>(triggerOutputPosition, Port::OUTPUT, module, DADSRHPlus::TRIGGER_OUTPUT)); + addOutput(createPort<Port24>(delayOutputPosition, PortWidget::OUTPUT, module, DADSRHPlus::DELAY_OUTPUT)); + addOutput(createPort<Port24>(attackOutputPosition, PortWidget::OUTPUT, module, DADSRHPlus::ATTACK_OUTPUT)); + addOutput(createPort<Port24>(decayOutputPosition, PortWidget::OUTPUT, module, DADSRHPlus::DECAY_OUTPUT)); + addOutput(createPort<Port24>(sustainOutputPosition, PortWidget::OUTPUT, module, DADSRHPlus::SUSTAIN_OUTPUT)); + addOutput(createPort<Port24>(releaseOutputPosition, PortWidget::OUTPUT, module, DADSRHPlus::RELEASE_OUTPUT)); + addOutput(createPort<Port24>(envOutputPosition, PortWidget::OUTPUT, module, DADSRHPlus::ENV_OUTPUT)); + addOutput(createPort<Port24>(invOutputPosition, PortWidget::OUTPUT, module, DADSRHPlus::INV_OUTPUT)); + addOutput(createPort<Port24>(triggerOutputPosition, PortWidget::OUTPUT, module, DADSRHPlus::TRIGGER_OUTPUT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(delayLightPosition, module, DADSRHPlus::DELAY_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(attackLightPosition, module, DADSRHPlus::ATTACK_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(decayLightPosition, module, DADSRHPlus::DECAY_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(sustainLightPosition, module, DADSRHPlus::SUSTAIN_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(releaseLightPosition, module, DADSRHPlus::RELEASE_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(attackShape1LightPosition, module, DADSRHPlus::ATTACK_SHAPE1_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(attackShape2LightPosition, module, DADSRHPlus::ATTACK_SHAPE2_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(attackShape3LightPosition, module, DADSRHPlus::ATTACK_SHAPE3_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(decayShape1LightPosition, module, DADSRHPlus::DECAY_SHAPE1_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(decayShape2LightPosition, module, DADSRHPlus::DECAY_SHAPE2_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(decayShape3LightPosition, module, DADSRHPlus::DECAY_SHAPE3_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(releaseShape1LightPosition, module, DADSRHPlus::RELEASE_SHAPE1_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(releaseShape2LightPosition, module, DADSRHPlus::RELEASE_SHAPE2_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(releaseShape3LightPosition, module, DADSRHPlus::RELEASE_SHAPE3_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(delayLightPosition, module, DADSRHPlus::DELAY_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(attackLightPosition, module, DADSRHPlus::ATTACK_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(decayLightPosition, module, DADSRHPlus::DECAY_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(sustainLightPosition, module, DADSRHPlus::SUSTAIN_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(releaseLightPosition, module, DADSRHPlus::RELEASE_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(attackShape1LightPosition, module, DADSRHPlus::ATTACK_SHAPE1_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(attackShape2LightPosition, module, DADSRHPlus::ATTACK_SHAPE2_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(attackShape3LightPosition, module, DADSRHPlus::ATTACK_SHAPE3_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(decayShape1LightPosition, module, DADSRHPlus::DECAY_SHAPE1_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(decayShape2LightPosition, module, DADSRHPlus::DECAY_SHAPE2_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(decayShape3LightPosition, module, DADSRHPlus::DECAY_SHAPE3_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(releaseShape1LightPosition, module, DADSRHPlus::RELEASE_SHAPE1_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(releaseShape2LightPosition, module, DADSRHPlus::RELEASE_SHAPE2_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(releaseShape3LightPosition, module, DADSRHPlus::RELEASE_SHAPE3_LIGHT)); } void appendContextMenu(Menu* menu) override { diff --git a/src/DGate.cpp b/src/DGate.cpp @@ -83,8 +83,8 @@ struct DGateWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto delayParamPosition = Vec(8.0, 33.0); @@ -101,18 +101,18 @@ struct DGateWidget : ModuleWidget { auto gateLightPosition = Vec(20.8, 124.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob29>(delayParamPosition, module, DGate::DELAY_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob29>(gateParamPosition, module, DGate::GATE_PARAM, 0.0, 1.0, 0.32)); - addParam(ParamWidget::create<SliderSwitch2State14>(loopParamPosition, module, DGate::LOOP_PARAM, 0.0, 1.0, 1.0)); - addParam(ParamWidget::create<Button18>(triggerParamPosition, module, DGate::TRIGGER_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<Knob29>(delayParamPosition, module, DGate::DELAY_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<Knob29>(gateParamPosition, module, DGate::GATE_PARAM, 0.0, 1.0, 0.32)); + addParam(createParam<SliderSwitch2State14>(loopParamPosition, module, DGate::LOOP_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<Button18>(triggerParamPosition, module, DGate::TRIGGER_PARAM, 0.0, 1.0, 0.0)); - addInput(Port::create<Port24>(triggerInputPosition, Port::INPUT, module, DGate::TRIGGER_INPUT)); + addInput(createPort<Port24>(triggerInputPosition, PortWidget::INPUT, module, DGate::TRIGGER_INPUT)); - addOutput(Port::create<Port24>(gateOutputPosition, Port::OUTPUT, module, DGate::GATE_OUTPUT)); - addOutput(Port::create<Port24>(endOutputPosition, Port::OUTPUT, module, DGate::END_OUTPUT)); + addOutput(createPort<Port24>(gateOutputPosition, PortWidget::OUTPUT, module, DGate::GATE_OUTPUT)); + addOutput(createPort<Port24>(endOutputPosition, PortWidget::OUTPUT, module, DGate::END_OUTPUT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(delayLightPosition, module, DGate::DELAY_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(gateLightPosition, module, DGate::GATE_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(delayLightPosition, module, DGate::DELAY_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(gateLightPosition, module, DGate::GATE_LIGHT)); } void appendContextMenu(Menu* menu) override { diff --git a/src/Detune.cpp b/src/Detune.cpp @@ -50,8 +50,8 @@ struct DetuneWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto centsParamPosition = Vec(9.5, 32.5); @@ -65,17 +65,17 @@ struct DetuneWidget : ModuleWidget { // end generated by svg_widgets.rb { - auto w = ParamWidget::create<Knob26>(centsParamPosition, module, Detune::CENTS_PARAM, 0.0, 50.0, 0.0); + auto w = createParam<Knob26>(centsParamPosition, module, Detune::CENTS_PARAM, 0.0, 50.0, 0.0); dynamic_cast<Knob*>(w)->snap = true; addParam(w); } - addInput(Port::create<Port24>(cvInputPosition, Port::INPUT, module, Detune::CV_INPUT)); - addInput(Port::create<Port24>(inInputPosition, Port::INPUT, module, Detune::IN_INPUT)); + addInput(createPort<Port24>(cvInputPosition, PortWidget::INPUT, module, Detune::CV_INPUT)); + addInput(createPort<Port24>(inInputPosition, PortWidget::INPUT, module, Detune::IN_INPUT)); - addOutput(Port::create<Port24>(thruOutputPosition, Port::OUTPUT, module, Detune::THRU_OUTPUT)); - addOutput(Port::create<Port24>(outPlusOutputPosition, Port::OUTPUT, module, Detune::OUT_PLUS_OUTPUT)); - addOutput(Port::create<Port24>(outMinusOutputPosition, Port::OUTPUT, module, Detune::OUT_MINUS_OUTPUT)); + addOutput(createPort<Port24>(thruOutputPosition, PortWidget::OUTPUT, module, Detune::THRU_OUTPUT)); + addOutput(createPort<Port24>(outPlusOutputPosition, PortWidget::OUTPUT, module, Detune::OUT_PLUS_OUTPUT)); + addOutput(createPort<Port24>(outMinusOutputPosition, PortWidget::OUTPUT, module, Detune::OUT_MINUS_OUTPUT)); } }; diff --git a/src/EightFO.cpp b/src/EightFO.cpp @@ -164,10 +164,10 @@ struct EightFOWidget : LFOBaseWidget { _panel->box.size = box.size; addChild(_panel); - addChild(Widget::create<ScrewSilver>(Vec(15, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 0))); - addChild(Widget::create<ScrewSilver>(Vec(15, 365))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 365))); + addChild(createWidget<ScrewSilver>(Vec(15, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0))); + addChild(createWidget<ScrewSilver>(Vec(15, 365))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 365))); // generated by svg_widgets.rb auto frequencyParamPosition = Vec(40.0, 45.0); @@ -211,10 +211,10 @@ struct EightFOWidget : LFOBaseWidget { auto slowLightPosition = Vec(86.0, 335.0); // end generated by svg_widgets.rb - _frequencyKnob = ParamWidget::create<Knob68>(frequencyParamPosition, module, EightFO::FREQUENCY_PARAM, -8.0, 5.0, 0.0); + _frequencyKnob = createParam<Knob68>(frequencyParamPosition, module, EightFO::FREQUENCY_PARAM, -8.0, 5.0, 0.0); addParam(_frequencyKnob); { - auto w = ParamWidget::create<Knob16>(waveParamPosition, module, EightFO::WAVE_PARAM, 1.0, 5.0, 3.0); + auto w = createParam<Knob16>(waveParamPosition, module, EightFO::WAVE_PARAM, 1.0, 5.0, 3.0); auto k = dynamic_cast<SVGKnob*>(w); k->snap = true; k->minAngle = 0.0; @@ -222,10 +222,10 @@ struct EightFOWidget : LFOBaseWidget { k->speed = 3.0; addParam(w); } - addParam(ParamWidget::create<StatefulButton9>(slowParamPosition, module, EightFO::SLOW_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob26>(samplePwmParamPosition, module, EightFO::SAMPLE_PWM_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob26>(offsetParamPosition, module, EightFO::OFFSET_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob26>(scaleParamPosition, module, EightFO::SCALE_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<StatefulButton9>(slowParamPosition, module, EightFO::SLOW_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<Knob26>(samplePwmParamPosition, module, EightFO::SAMPLE_PWM_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob26>(offsetParamPosition, module, EightFO::OFFSET_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob26>(scaleParamPosition, module, EightFO::SCALE_PARAM, 0.0, 1.0, 1.0)); addPhaseParam(phase7ParamPosition, module, EightFO::PHASE7_PARAM, Phasor::phaseToRadians(module->basePhase7Offset)); addPhaseParam(phase6ParamPosition, module, EightFO::PHASE6_PARAM, Phasor::phaseToRadians(module->basePhase6Offset)); @@ -236,34 +236,34 @@ struct EightFOWidget : LFOBaseWidget { addPhaseParam(phase1ParamPosition, module, EightFO::PHASE1_PARAM, Phasor::phaseToRadians(module->basePhase1Offset)); addPhaseParam(phase0ParamPosition, module, EightFO::PHASE0_PARAM, Phasor::phaseToRadians(module->basePhase0Offset)); - addInput(Port::create<Port24>(samplePwmInputPosition, Port::INPUT, module, EightFO::SAMPLE_PWM_INPUT)); - addInput(Port::create<Port24>(offsetInputPosition, Port::INPUT, module, EightFO::OFFSET_INPUT)); - addInput(Port::create<Port24>(scaleInputPosition, Port::INPUT, module, EightFO::SCALE_INPUT)); - addInput(Port::create<Port24>(phase7InputPosition, Port::INPUT, module, EightFO::PHASE7_INPUT)); - addInput(Port::create<Port24>(phase6InputPosition, Port::INPUT, module, EightFO::PHASE6_INPUT)); - addInput(Port::create<Port24>(phase5InputPosition, Port::INPUT, module, EightFO::PHASE5_INPUT)); - addInput(Port::create<Port24>(phase4InputPosition, Port::INPUT, module, EightFO::PHASE4_INPUT)); - addInput(Port::create<Port24>(phase3InputPosition, Port::INPUT, module, EightFO::PHASE3_INPUT)); - addInput(Port::create<Port24>(phase2InputPosition, Port::INPUT, module, EightFO::PHASE2_INPUT)); - addInput(Port::create<Port24>(phase1InputPosition, Port::INPUT, module, EightFO::PHASE1_INPUT)); - addInput(Port::create<Port24>(phase0InputPosition, Port::INPUT, module, EightFO::PHASE0_INPUT)); - addInput(Port::create<Port24>(pitchInputPosition, Port::INPUT, module, EightFO::PITCH_INPUT)); - addInput(Port::create<Port24>(resetInputPosition, Port::INPUT, module, EightFO::RESET_INPUT)); + addInput(createPort<Port24>(samplePwmInputPosition, PortWidget::INPUT, module, EightFO::SAMPLE_PWM_INPUT)); + addInput(createPort<Port24>(offsetInputPosition, PortWidget::INPUT, module, EightFO::OFFSET_INPUT)); + addInput(createPort<Port24>(scaleInputPosition, PortWidget::INPUT, module, EightFO::SCALE_INPUT)); + addInput(createPort<Port24>(phase7InputPosition, PortWidget::INPUT, module, EightFO::PHASE7_INPUT)); + addInput(createPort<Port24>(phase6InputPosition, PortWidget::INPUT, module, EightFO::PHASE6_INPUT)); + addInput(createPort<Port24>(phase5InputPosition, PortWidget::INPUT, module, EightFO::PHASE5_INPUT)); + addInput(createPort<Port24>(phase4InputPosition, PortWidget::INPUT, module, EightFO::PHASE4_INPUT)); + addInput(createPort<Port24>(phase3InputPosition, PortWidget::INPUT, module, EightFO::PHASE3_INPUT)); + addInput(createPort<Port24>(phase2InputPosition, PortWidget::INPUT, module, EightFO::PHASE2_INPUT)); + addInput(createPort<Port24>(phase1InputPosition, PortWidget::INPUT, module, EightFO::PHASE1_INPUT)); + addInput(createPort<Port24>(phase0InputPosition, PortWidget::INPUT, module, EightFO::PHASE0_INPUT)); + addInput(createPort<Port24>(pitchInputPosition, PortWidget::INPUT, module, EightFO::PITCH_INPUT)); + addInput(createPort<Port24>(resetInputPosition, PortWidget::INPUT, module, EightFO::RESET_INPUT)); - addOutput(Port::create<Port24>(phase7OutputPosition, Port::OUTPUT, module, EightFO::PHASE7_OUTPUT)); - addOutput(Port::create<Port24>(phase6OutputPosition, Port::OUTPUT, module, EightFO::PHASE6_OUTPUT)); - addOutput(Port::create<Port24>(phase5OutputPosition, Port::OUTPUT, module, EightFO::PHASE5_OUTPUT)); - addOutput(Port::create<Port24>(phase4OutputPosition, Port::OUTPUT, module, EightFO::PHASE4_OUTPUT)); - addOutput(Port::create<Port24>(phase3OutputPosition, Port::OUTPUT, module, EightFO::PHASE3_OUTPUT)); - addOutput(Port::create<Port24>(phase2OutputPosition, Port::OUTPUT, module, EightFO::PHASE2_OUTPUT)); - addOutput(Port::create<Port24>(phase1OutputPosition, Port::OUTPUT, module, EightFO::PHASE1_OUTPUT)); - addOutput(Port::create<Port24>(phase0OutputPosition, Port::OUTPUT, module, EightFO::PHASE0_OUTPUT)); + addOutput(createPort<Port24>(phase7OutputPosition, PortWidget::OUTPUT, module, EightFO::PHASE7_OUTPUT)); + addOutput(createPort<Port24>(phase6OutputPosition, PortWidget::OUTPUT, module, EightFO::PHASE6_OUTPUT)); + addOutput(createPort<Port24>(phase5OutputPosition, PortWidget::OUTPUT, module, EightFO::PHASE5_OUTPUT)); + addOutput(createPort<Port24>(phase4OutputPosition, PortWidget::OUTPUT, module, EightFO::PHASE4_OUTPUT)); + addOutput(createPort<Port24>(phase3OutputPosition, PortWidget::OUTPUT, module, EightFO::PHASE3_OUTPUT)); + addOutput(createPort<Port24>(phase2OutputPosition, PortWidget::OUTPUT, module, EightFO::PHASE2_OUTPUT)); + addOutput(createPort<Port24>(phase1OutputPosition, PortWidget::OUTPUT, module, EightFO::PHASE1_OUTPUT)); + addOutput(createPort<Port24>(phase0OutputPosition, PortWidget::OUTPUT, module, EightFO::PHASE0_OUTPUT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(slowLightPosition, module, EightFO::SLOW_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(slowLightPosition, module, EightFO::SLOW_LIGHT)); } void addPhaseParam(const Vec& position, Module* module, EightFO::ParamsIds paramId, float rotation) { - auto w = ParamWidget::create<Knob16>(position, module, paramId, -1.0, 1.0, 0.0); + auto w = createParam<Knob16>(position, module, paramId, -1.0, 1.0, 0.0); auto k = dynamic_cast<SVGKnob*>(w); k->minAngle += 0.5 * M_PI - rotation; k->maxAngle += 0.5 * M_PI - rotation; diff --git a/src/EightOne.cpp b/src/EightOne.cpp @@ -86,8 +86,8 @@ struct EightOneWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto stepsParamPosition = Vec(58.5, 131.5); @@ -119,39 +119,39 @@ struct EightOneWidget : ModuleWidget { // end generated by svg_widgets.rb { - auto w = ParamWidget::create<Knob16>(stepsParamPosition, module, EightOne::STEPS_PARAM, 1.0, 8.0, 8.0); + auto w = createParam<Knob16>(stepsParamPosition, module, EightOne::STEPS_PARAM, 1.0, 8.0, 8.0); dynamic_cast<Knob*>(w)->snap = true; addParam(w); } - addParam(ParamWidget::create<SliderSwitch2State14>(directionParamPosition, module, EightOne::DIRECTION_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<SliderSwitch2State14>(directionParamPosition, module, EightOne::DIRECTION_PARAM, 0.0, 1.0, 1.0)); { - auto w = ParamWidget::create<Knob29>(selectParamPosition, module, EightOne::SELECT_PARAM, 0.0, 7.0, 0.0); + auto w = createParam<Knob29>(selectParamPosition, module, EightOne::SELECT_PARAM, 0.0, 7.0, 0.0); dynamic_cast<Knob*>(w)->snap = true; addParam(w); } - addInput(Port::create<Port24>(in1InputPosition, Port::INPUT, module, EightOne::IN1_INPUT)); - addInput(Port::create<Port24>(in2InputPosition, Port::INPUT, module, EightOne::IN2_INPUT)); - addInput(Port::create<Port24>(in3InputPosition, Port::INPUT, module, EightOne::IN3_INPUT)); - addInput(Port::create<Port24>(in4InputPosition, Port::INPUT, module, EightOne::IN4_INPUT)); - addInput(Port::create<Port24>(in5InputPosition, Port::INPUT, module, EightOne::IN5_INPUT)); - addInput(Port::create<Port24>(in6InputPosition, Port::INPUT, module, EightOne::IN6_INPUT)); - addInput(Port::create<Port24>(in7InputPosition, Port::INPUT, module, EightOne::IN7_INPUT)); - addInput(Port::create<Port24>(in8InputPosition, Port::INPUT, module, EightOne::IN8_INPUT)); - addInput(Port::create<Port24>(clockInputPosition, Port::INPUT, module, EightOne::CLOCK_INPUT)); - addInput(Port::create<Port24>(resetInputPosition, Port::INPUT, module, EightOne::RESET_INPUT)); - addInput(Port::create<Port24>(selectInputPosition, Port::INPUT, module, EightOne::SELECT_INPUT)); - - addOutput(Port::create<Port24>(outOutputPosition, Port::OUTPUT, module, EightOne::OUT_OUTPUT)); - - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(in1LightPosition, module, EightOne::IN1_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(in2LightPosition, module, EightOne::IN2_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(in3LightPosition, module, EightOne::IN3_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(in4LightPosition, module, EightOne::IN4_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(in5LightPosition, module, EightOne::IN5_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(in6LightPosition, module, EightOne::IN6_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(in7LightPosition, module, EightOne::IN7_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(in8LightPosition, module, EightOne::IN8_LIGHT)); + addInput(createPort<Port24>(in1InputPosition, PortWidget::INPUT, module, EightOne::IN1_INPUT)); + addInput(createPort<Port24>(in2InputPosition, PortWidget::INPUT, module, EightOne::IN2_INPUT)); + addInput(createPort<Port24>(in3InputPosition, PortWidget::INPUT, module, EightOne::IN3_INPUT)); + addInput(createPort<Port24>(in4InputPosition, PortWidget::INPUT, module, EightOne::IN4_INPUT)); + addInput(createPort<Port24>(in5InputPosition, PortWidget::INPUT, module, EightOne::IN5_INPUT)); + addInput(createPort<Port24>(in6InputPosition, PortWidget::INPUT, module, EightOne::IN6_INPUT)); + addInput(createPort<Port24>(in7InputPosition, PortWidget::INPUT, module, EightOne::IN7_INPUT)); + addInput(createPort<Port24>(in8InputPosition, PortWidget::INPUT, module, EightOne::IN8_INPUT)); + addInput(createPort<Port24>(clockInputPosition, PortWidget::INPUT, module, EightOne::CLOCK_INPUT)); + addInput(createPort<Port24>(resetInputPosition, PortWidget::INPUT, module, EightOne::RESET_INPUT)); + addInput(createPort<Port24>(selectInputPosition, PortWidget::INPUT, module, EightOne::SELECT_INPUT)); + + addOutput(createPort<Port24>(outOutputPosition, PortWidget::OUTPUT, module, EightOne::OUT_OUTPUT)); + + addChild(createLight<SmallLight<GreenLight>>(in1LightPosition, module, EightOne::IN1_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(in2LightPosition, module, EightOne::IN2_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(in3LightPosition, module, EightOne::IN3_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(in4LightPosition, module, EightOne::IN4_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(in5LightPosition, module, EightOne::IN5_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(in6LightPosition, module, EightOne::IN6_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(in7LightPosition, module, EightOne::IN7_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(in8LightPosition, module, EightOne::IN8_LIGHT)); } void appendContextMenu(Menu* menu) override { diff --git a/src/FMOp.cpp b/src/FMOp.cpp @@ -219,10 +219,10 @@ struct FMOpWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(15, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 0))); - addChild(Widget::create<ScrewSilver>(Vec(15, 365))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 365))); + addChild(createWidget<ScrewSilver>(Vec(15, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0))); + addChild(createWidget<ScrewSilver>(Vec(15, 365))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 365))); // generated by svg_widgets.rb auto ratioParamPosition = Vec(30.0, 45.0); @@ -253,32 +253,32 @@ struct FMOpWidget : ModuleWidget { auto envToLevelLightPosition = Vec(30.0, 253.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob38>(ratioParamPosition, module, FMOp::RATIO_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob16>(fineParamPosition, module, FMOp::FINE_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob26>(attackParamPosition, module, FMOp::ATTACK_PARAM, 0.0, 1.0, 0.12)); - addParam(ParamWidget::create<Knob26>(decayParamPosition, module, FMOp::DECAY_PARAM, 0.0, 1.0, 0.31623)); - addParam(ParamWidget::create<Knob26>(sustainParamPosition, module, FMOp::SUSTAIN_PARAM, 0.0, 1.0, 1.0)); - addParam(ParamWidget::create<Knob26>(releaseParamPosition, module, FMOp::RELEASE_PARAM, 0.0, 1.0, 0.31623)); - addParam(ParamWidget::create<Knob26>(depthParamPosition, module, FMOp::DEPTH_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob26>(feedbackParamPosition, module, FMOp::FEEDBACK_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob26>(levelParamPosition, module, FMOp::LEVEL_PARAM, 0.0, 1.0, 1.0)); - addParam(ParamWidget::create<StatefulButton9>(envToLevelParamPosition, module, FMOp::ENV_TO_LEVEL_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<StatefulButton9>(envToFeedbackParamPosition, module, FMOp::ENV_TO_FEEDBACK_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<StatefulButton9>(envToDepthParamPosition, module, FMOp::ENV_TO_DEPTH_PARAM, 0.0, 1.0, 0.0)); - - addInput(Port::create<Port24>(sustainInputPosition, Port::INPUT, module, FMOp::SUSTAIN_INPUT)); - addInput(Port::create<Port24>(depthInputPosition, Port::INPUT, module, FMOp::DEPTH_INPUT)); - addInput(Port::create<Port24>(feedbackInputPosition, Port::INPUT, module, FMOp::FEEDBACK_INPUT)); - addInput(Port::create<Port24>(levelInputPosition, Port::INPUT, module, FMOp::LEVEL_INPUT)); - addInput(Port::create<Port24>(pitchInputPosition, Port::INPUT, module, FMOp::PITCH_INPUT)); - addInput(Port::create<Port24>(gateInputPosition, Port::INPUT, module, FMOp::GATE_INPUT)); - addInput(Port::create<Port24>(fmInputPosition, Port::INPUT, module, FMOp::FM_INPUT)); - - addOutput(Port::create<Port24>(audioOutputPosition, Port::OUTPUT, module, FMOp::AUDIO_OUTPUT)); - - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(envToLevelLightPosition, module, FMOp::ENV_TO_LEVEL_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(envToFeedbackLightPosition, module, FMOp::ENV_TO_FEEDBACK_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(envToDepthLightPosition, module, FMOp::ENV_TO_DEPTH_LIGHT)); + addParam(createParam<Knob38>(ratioParamPosition, module, FMOp::RATIO_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob16>(fineParamPosition, module, FMOp::FINE_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob26>(attackParamPosition, module, FMOp::ATTACK_PARAM, 0.0, 1.0, 0.12)); + addParam(createParam<Knob26>(decayParamPosition, module, FMOp::DECAY_PARAM, 0.0, 1.0, 0.31623)); + addParam(createParam<Knob26>(sustainParamPosition, module, FMOp::SUSTAIN_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<Knob26>(releaseParamPosition, module, FMOp::RELEASE_PARAM, 0.0, 1.0, 0.31623)); + addParam(createParam<Knob26>(depthParamPosition, module, FMOp::DEPTH_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<Knob26>(feedbackParamPosition, module, FMOp::FEEDBACK_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<Knob26>(levelParamPosition, module, FMOp::LEVEL_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<StatefulButton9>(envToLevelParamPosition, module, FMOp::ENV_TO_LEVEL_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<StatefulButton9>(envToFeedbackParamPosition, module, FMOp::ENV_TO_FEEDBACK_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<StatefulButton9>(envToDepthParamPosition, module, FMOp::ENV_TO_DEPTH_PARAM, 0.0, 1.0, 0.0)); + + addInput(createPort<Port24>(sustainInputPosition, PortWidget::INPUT, module, FMOp::SUSTAIN_INPUT)); + addInput(createPort<Port24>(depthInputPosition, PortWidget::INPUT, module, FMOp::DEPTH_INPUT)); + addInput(createPort<Port24>(feedbackInputPosition, PortWidget::INPUT, module, FMOp::FEEDBACK_INPUT)); + addInput(createPort<Port24>(levelInputPosition, PortWidget::INPUT, module, FMOp::LEVEL_INPUT)); + addInput(createPort<Port24>(pitchInputPosition, PortWidget::INPUT, module, FMOp::PITCH_INPUT)); + addInput(createPort<Port24>(gateInputPosition, PortWidget::INPUT, module, FMOp::GATE_INPUT)); + addInput(createPort<Port24>(fmInputPosition, PortWidget::INPUT, module, FMOp::FM_INPUT)); + + addOutput(createPort<Port24>(audioOutputPosition, PortWidget::OUTPUT, module, FMOp::AUDIO_OUTPUT)); + + addChild(createLight<SmallLight<GreenLight>>(envToLevelLightPosition, module, FMOp::ENV_TO_LEVEL_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(envToFeedbackLightPosition, module, FMOp::ENV_TO_FEEDBACK_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(envToDepthLightPosition, module, FMOp::ENV_TO_DEPTH_LIGHT)); } void appendContextMenu(Menu* menu) override { diff --git a/src/FlipFlop.cpp b/src/FlipFlop.cpp @@ -72,8 +72,8 @@ struct FlipFlopWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto in1InputPosition = Vec(10.5, 21.0); @@ -87,15 +87,15 @@ struct FlipFlopWidget : ModuleWidget { auto b2OutputPosition = Vec(10.5, 280.0); // end generated by svg_widgets.rb - addInput(Port::create<Port24>(in1InputPosition, Port::INPUT, module, FlipFlop::IN1_INPUT)); - addInput(Port::create<Port24>(reset1InputPosition, Port::INPUT, module, FlipFlop::RESET1_INPUT)); - addInput(Port::create<Port24>(in2InputPosition, Port::INPUT, module, FlipFlop::IN2_INPUT)); - addInput(Port::create<Port24>(reset2InputPosition, Port::INPUT, module, FlipFlop::RESET2_INPUT)); + addInput(createPort<Port24>(in1InputPosition, PortWidget::INPUT, module, FlipFlop::IN1_INPUT)); + addInput(createPort<Port24>(reset1InputPosition, PortWidget::INPUT, module, FlipFlop::RESET1_INPUT)); + addInput(createPort<Port24>(in2InputPosition, PortWidget::INPUT, module, FlipFlop::IN2_INPUT)); + addInput(createPort<Port24>(reset2InputPosition, PortWidget::INPUT, module, FlipFlop::RESET2_INPUT)); - addOutput(Port::create<Port24>(a1OutputPosition, Port::OUTPUT, module, FlipFlop::A1_OUTPUT)); - addOutput(Port::create<Port24>(b1OutputPosition, Port::OUTPUT, module, FlipFlop::B1_OUTPUT)); - addOutput(Port::create<Port24>(a2OutputPosition, Port::OUTPUT, module, FlipFlop::A2_OUTPUT)); - addOutput(Port::create<Port24>(b2OutputPosition, Port::OUTPUT, module, FlipFlop::B2_OUTPUT)); + addOutput(createPort<Port24>(a1OutputPosition, PortWidget::OUTPUT, module, FlipFlop::A1_OUTPUT)); + addOutput(createPort<Port24>(b1OutputPosition, PortWidget::OUTPUT, module, FlipFlop::B1_OUTPUT)); + addOutput(createPort<Port24>(a2OutputPosition, PortWidget::OUTPUT, module, FlipFlop::A2_OUTPUT)); + addOutput(createPort<Port24>(b2OutputPosition, PortWidget::OUTPUT, module, FlipFlop::B2_OUTPUT)); } }; diff --git a/src/Follow.cpp b/src/Follow.cpp @@ -35,8 +35,8 @@ struct FollowWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto responseParamPosition = Vec(8.0, 36.0); @@ -49,14 +49,14 @@ struct FollowWidget : ModuleWidget { auto outOutputPosition = Vec(10.5, 271.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob29>(responseParamPosition, module, Follow::RESPONSE_PARAM, 0.0, 1.0, 0.3)); - addParam(ParamWidget::create<Knob29>(scaleParamPosition, module, Follow::SCALE_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<Knob29>(responseParamPosition, module, Follow::RESPONSE_PARAM, 0.0, 1.0, 0.3)); + addParam(createParam<Knob29>(scaleParamPosition, module, Follow::SCALE_PARAM, 0.0, 1.0, 1.0)); - addInput(Port::create<Port24>(responseInputPosition, Port::INPUT, module, Follow::RESPONSE_INPUT)); - addInput(Port::create<Port24>(scaleInputPosition, Port::INPUT, module, Follow::SCALE_INPUT)); - addInput(Port::create<Port24>(inInputPosition, Port::INPUT, module, Follow::IN_INPUT)); + addInput(createPort<Port24>(responseInputPosition, PortWidget::INPUT, module, Follow::RESPONSE_INPUT)); + addInput(createPort<Port24>(scaleInputPosition, PortWidget::INPUT, module, Follow::SCALE_INPUT)); + addInput(createPort<Port24>(inInputPosition, PortWidget::INPUT, module, Follow::IN_INPUT)); - addOutput(Port::create<Port24>(outOutputPosition, Port::OUTPUT, module, Follow::OUT_OUTPUT)); + addOutput(createPort<Port24>(outOutputPosition, PortWidget::OUTPUT, module, Follow::OUT_OUTPUT)); } }; diff --git a/src/LFO.cpp b/src/LFO.cpp @@ -115,10 +115,10 @@ struct LFOWidget : LFOBaseWidget { _panel->box.size = box.size; addChild(_panel); - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 0))); - addChild(Widget::create<ScrewSilver>(Vec(0, 365))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 0))); + addChild(createWidget<ScrewSilver>(Vec(0, 365))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto frequencyParamPosition = Vec(41.0, 45.0); @@ -144,28 +144,28 @@ struct LFOWidget : LFOBaseWidget { auto slowLightPosition = Vec(111.0, 240.0); // end generated by svg_widgets.rb - _frequencyKnob = ParamWidget::create<Knob68>(frequencyParamPosition, module, LFO::FREQUENCY_PARAM, -8.0, 5.0, 0.0); + _frequencyKnob = createParam<Knob68>(frequencyParamPosition, module, LFO::FREQUENCY_PARAM, -8.0, 5.0, 0.0); addParam(_frequencyKnob); - addParam(ParamWidget::create<StatefulButton9>(slowParamPosition, module, LFO::SLOW_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob26>(sampleParamPosition, module, LFO::SAMPLE_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob26>(pwParamPosition, module, LFO::PW_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob16>(offsetParamPosition, module, LFO::OFFSET_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob16>(scaleParamPosition, module, LFO::SCALE_PARAM, 0.0, 1.0, 1.0)); - - addInput(Port::create<Port24>(sampleInputPosition, Port::INPUT, module, LFO::SAMPLE_INPUT)); - addInput(Port::create<Port24>(pwInputPosition, Port::INPUT, module, LFO::PW_INPUT)); - addInput(Port::create<Port24>(offsetInputPosition, Port::INPUT, module, LFO::OFFSET_INPUT)); - addInput(Port::create<Port24>(scaleInputPosition, Port::INPUT, module, LFO::SCALE_INPUT)); - addInput(Port::create<Port24>(pitchInputPosition, Port::INPUT, module, LFO::PITCH_INPUT)); - addInput(Port::create<Port24>(resetInputPosition, Port::INPUT, module, LFO::RESET_INPUT)); - - addOutput(Port::create<Port24>(rampUpOutputPosition, Port::OUTPUT, module, LFO::RAMP_UP_OUTPUT)); - addOutput(Port::create<Port24>(rampDownOutputPosition, Port::OUTPUT, module, LFO::RAMP_DOWN_OUTPUT)); - addOutput(Port::create<Port24>(squareOutputPosition, Port::OUTPUT, module, LFO::SQUARE_OUTPUT)); - addOutput(Port::create<Port24>(triangleOutputPosition, Port::OUTPUT, module, LFO::TRIANGLE_OUTPUT)); - addOutput(Port::create<Port24>(sineOutputPosition, Port::OUTPUT, module, LFO::SINE_OUTPUT)); - - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(slowLightPosition, module, LFO::SLOW_LIGHT)); + addParam(createParam<StatefulButton9>(slowParamPosition, module, LFO::SLOW_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<Knob26>(sampleParamPosition, module, LFO::SAMPLE_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<Knob26>(pwParamPosition, module, LFO::PW_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob16>(offsetParamPosition, module, LFO::OFFSET_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob16>(scaleParamPosition, module, LFO::SCALE_PARAM, 0.0, 1.0, 1.0)); + + addInput(createPort<Port24>(sampleInputPosition, PortWidget::INPUT, module, LFO::SAMPLE_INPUT)); + addInput(createPort<Port24>(pwInputPosition, PortWidget::INPUT, module, LFO::PW_INPUT)); + addInput(createPort<Port24>(offsetInputPosition, PortWidget::INPUT, module, LFO::OFFSET_INPUT)); + addInput(createPort<Port24>(scaleInputPosition, PortWidget::INPUT, module, LFO::SCALE_INPUT)); + addInput(createPort<Port24>(pitchInputPosition, PortWidget::INPUT, module, LFO::PITCH_INPUT)); + addInput(createPort<Port24>(resetInputPosition, PortWidget::INPUT, module, LFO::RESET_INPUT)); + + addOutput(createPort<Port24>(rampUpOutputPosition, PortWidget::OUTPUT, module, LFO::RAMP_UP_OUTPUT)); + addOutput(createPort<Port24>(rampDownOutputPosition, PortWidget::OUTPUT, module, LFO::RAMP_DOWN_OUTPUT)); + addOutput(createPort<Port24>(squareOutputPosition, PortWidget::OUTPUT, module, LFO::SQUARE_OUTPUT)); + addOutput(createPort<Port24>(triangleOutputPosition, PortWidget::OUTPUT, module, LFO::TRIANGLE_OUTPUT)); + addOutput(createPort<Port24>(sineOutputPosition, PortWidget::OUTPUT, module, LFO::SINE_OUTPUT)); + + addChild(createLight<SmallLight<GreenLight>>(slowLightPosition, module, LFO::SLOW_LIGHT)); } }; diff --git a/src/LLFO.cpp b/src/LLFO.cpp @@ -92,8 +92,8 @@ struct LLFOWidget : LFOBaseWidget { _panel->box.size = box.size; addChild(_panel); - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto frequencyParamPosition = Vec(9.5, 27.0); @@ -116,25 +116,25 @@ struct LLFOWidget : LFOBaseWidget { auto pulseLightPosition = Vec(24.0, 115.0); // end generated by svg_widgets.rb - _frequencyKnob = ParamWidget::create<Knob26>(frequencyParamPosition, module, LLFO::FREQUENCY_PARAM, -8.0, 5.0, 0.0); + _frequencyKnob = createParam<Knob26>(frequencyParamPosition, module, LLFO::FREQUENCY_PARAM, -8.0, 5.0, 0.0); addParam(_frequencyKnob); - addParam(ParamWidget::create<StatefulButton9>(slowParamPosition, module, LLFO::SLOW_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<StatefulButton9>(waveParamPosition, module, LLFO::WAVE_PARAM, 0.0, 5.0, 0.0)); - addParam(ParamWidget::create<Knob16>(offsetParamPosition, module, LLFO::OFFSET_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob16>(scaleParamPosition, module, LLFO::SCALE_PARAM, 0.0, 1.0, 1.0)); - - addInput(Port::create<Port24>(pitchInputPosition, Port::INPUT, module, LLFO::PITCH_INPUT)); - addInput(Port::create<Port24>(resetInputPosition, Port::INPUT, module, LLFO::RESET_INPUT)); - - addOutput(Port::create<Port24>(outOutputPosition, Port::OUTPUT, module, LLFO::OUT_OUTPUT)); - - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(slowLightPosition, module, LLFO::SLOW_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(sineLightPosition, module, LLFO::SINE_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(rampUpLightPosition, module, LLFO::RAMP_UP_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(squareLightPosition, module, LLFO::SQUARE_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(triangleLightPosition, module, LLFO::TRIANGLE_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(rampDownLightPosition, module, LLFO::RAMP_DOWN_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(pulseLightPosition, module, LLFO::PULSE_LIGHT)); + addParam(createParam<StatefulButton9>(slowParamPosition, module, LLFO::SLOW_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<StatefulButton9>(waveParamPosition, module, LLFO::WAVE_PARAM, 0.0, 5.0, 0.0)); + addParam(createParam<Knob16>(offsetParamPosition, module, LLFO::OFFSET_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob16>(scaleParamPosition, module, LLFO::SCALE_PARAM, 0.0, 1.0, 1.0)); + + addInput(createPort<Port24>(pitchInputPosition, PortWidget::INPUT, module, LLFO::PITCH_INPUT)); + addInput(createPort<Port24>(resetInputPosition, PortWidget::INPUT, module, LLFO::RESET_INPUT)); + + addOutput(createPort<Port24>(outOutputPosition, PortWidget::OUTPUT, module, LLFO::OUT_OUTPUT)); + + addChild(createLight<SmallLight<GreenLight>>(slowLightPosition, module, LLFO::SLOW_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(sineLightPosition, module, LLFO::SINE_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(rampUpLightPosition, module, LLFO::RAMP_UP_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(squareLightPosition, module, LLFO::SQUARE_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(triangleLightPosition, module, LLFO::TRIANGLE_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(rampDownLightPosition, module, LLFO::RAMP_DOWN_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(pulseLightPosition, module, LLFO::PULSE_LIGHT)); } }; diff --git a/src/Lag.cpp b/src/Lag.cpp @@ -62,8 +62,8 @@ struct LagWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto timeParamPosition = Vec(8.0, 36.0); @@ -77,9 +77,9 @@ struct LagWidget : ModuleWidget { auto outOutputPosition = Vec(10.5, 305.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob29>(timeParamPosition, module, Lag::TIME_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam<Knob29>(timeParamPosition, module, Lag::TIME_PARAM, 0.0, 1.0, 0.5)); { - auto w = ParamWidget::create<Knob16>(timeScaleParamPosition, module, Lag::TIME_SCALE_PARAM, 0.0, 2.0, 1.0); + auto w = createParam<Knob16>(timeScaleParamPosition, module, Lag::TIME_SCALE_PARAM, 0.0, 2.0, 1.0); auto k = dynamic_cast<SVGKnob*>(w); k->snap = true; k->minAngle = -M_PI / 4.0f; @@ -87,13 +87,13 @@ struct LagWidget : ModuleWidget { k->speed = 3.0; addParam(w); } - addParam(ParamWidget::create<Knob29>(shapeParamPosition, module, Lag::SHAPE_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob29>(shapeParamPosition, module, Lag::SHAPE_PARAM, -1.0, 1.0, 0.0)); - addInput(Port::create<Port24>(timeInputPosition, Port::INPUT, module, Lag::TIME_INPUT)); - addInput(Port::create<Port24>(shapeInputPosition, Port::INPUT, module, Lag::SHAPE_INPUT)); - addInput(Port::create<Port24>(inInputPosition, Port::INPUT, module, Lag::IN_INPUT)); + addInput(createPort<Port24>(timeInputPosition, PortWidget::INPUT, module, Lag::TIME_INPUT)); + addInput(createPort<Port24>(shapeInputPosition, PortWidget::INPUT, module, Lag::SHAPE_INPUT)); + addInput(createPort<Port24>(inInputPosition, PortWidget::INPUT, module, Lag::IN_INPUT)); - addOutput(Port::create<Port24>(outOutputPosition, Port::OUTPUT, module, Lag::OUT_OUTPUT)); + addOutput(createPort<Port24>(outOutputPosition, PortWidget::OUTPUT, module, Lag::OUT_OUTPUT)); } }; diff --git a/src/Lmtr.cpp b/src/Lmtr.cpp @@ -77,8 +77,8 @@ struct LmtrWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto thresholdParamPosition = Vec(26.0, 52.0); @@ -94,17 +94,17 @@ struct LmtrWidget : ModuleWidget { auto rightOutputPosition = Vec(50.0, 320.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob38>(thresholdParamPosition, module, Lmtr::THRESHOLD_PARAM, 0.0, 1.0, 0.8)); - addParam(ParamWidget::create<Knob38>(outputGainParamPosition, module, Lmtr::OUTPUT_GAIN_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<SliderSwitch2State14>(kneeParamPosition, module, Lmtr::KNEE_PARAM, 0.95, 1.0, 0.0)); + addParam(createParam<Knob38>(thresholdParamPosition, module, Lmtr::THRESHOLD_PARAM, 0.0, 1.0, 0.8)); + addParam(createParam<Knob38>(outputGainParamPosition, module, Lmtr::OUTPUT_GAIN_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<SliderSwitch2State14>(kneeParamPosition, module, Lmtr::KNEE_PARAM, 0.95, 1.0, 0.0)); - addInput(Port::create<Port24>(leftInputPosition, Port::INPUT, module, Lmtr::LEFT_INPUT)); - addInput(Port::create<Port24>(rightInputPosition, Port::INPUT, module, Lmtr::RIGHT_INPUT)); - addInput(Port::create<Port24>(thresholdInputPosition, Port::INPUT, module, Lmtr::THRESHOLD_INPUT)); - addInput(Port::create<Port24>(outputGainInputPosition, Port::INPUT, module, Lmtr::OUTPUT_GAIN_INPUT)); + addInput(createPort<Port24>(leftInputPosition, PortWidget::INPUT, module, Lmtr::LEFT_INPUT)); + addInput(createPort<Port24>(rightInputPosition, PortWidget::INPUT, module, Lmtr::RIGHT_INPUT)); + addInput(createPort<Port24>(thresholdInputPosition, PortWidget::INPUT, module, Lmtr::THRESHOLD_INPUT)); + addInput(createPort<Port24>(outputGainInputPosition, PortWidget::INPUT, module, Lmtr::OUTPUT_GAIN_INPUT)); - addOutput(Port::create<Port24>(leftOutputPosition, Port::OUTPUT, module, Lmtr::LEFT_OUTPUT)); - addOutput(Port::create<Port24>(rightOutputPosition, Port::OUTPUT, module, Lmtr::RIGHT_OUTPUT)); + addOutput(createPort<Port24>(leftOutputPosition, PortWidget::OUTPUT, module, Lmtr::LEFT_OUTPUT)); + addOutput(createPort<Port24>(rightOutputPosition, PortWidget::OUTPUT, module, Lmtr::RIGHT_OUTPUT)); } }; diff --git a/src/Manual.cpp b/src/Manual.cpp @@ -42,8 +42,8 @@ struct ManualWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto triggerParamPosition = Vec(13.5, 22.0); @@ -58,16 +58,16 @@ struct ManualWidget : ModuleWidget { auto out8OutputPosition = Vec(10.5, 267.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Button18>(triggerParamPosition, module, Manual::TRIGGER_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<Button18>(triggerParamPosition, module, Manual::TRIGGER_PARAM, 0.0, 1.0, 0.0)); - addOutput(Port::create<Port24>(out1OutputPosition, Port::OUTPUT, module, Manual::OUT1_OUTPUT)); - addOutput(Port::create<Port24>(out2OutputPosition, Port::OUTPUT, module, Manual::OUT2_OUTPUT)); - addOutput(Port::create<Port24>(out3OutputPosition, Port::OUTPUT, module, Manual::OUT3_OUTPUT)); - addOutput(Port::create<Port24>(out4OutputPosition, Port::OUTPUT, module, Manual::OUT4_OUTPUT)); - addOutput(Port::create<Port24>(out5OutputPosition, Port::OUTPUT, module, Manual::OUT5_OUTPUT)); - addOutput(Port::create<Port24>(out6OutputPosition, Port::OUTPUT, module, Manual::OUT6_OUTPUT)); - addOutput(Port::create<Port24>(out7OutputPosition, Port::OUTPUT, module, Manual::OUT7_OUTPUT)); - addOutput(Port::create<Port24>(out8OutputPosition, Port::OUTPUT, module, Manual::OUT8_OUTPUT)); + addOutput(createPort<Port24>(out1OutputPosition, PortWidget::OUTPUT, module, Manual::OUT1_OUTPUT)); + addOutput(createPort<Port24>(out2OutputPosition, PortWidget::OUTPUT, module, Manual::OUT2_OUTPUT)); + addOutput(createPort<Port24>(out3OutputPosition, PortWidget::OUTPUT, module, Manual::OUT3_OUTPUT)); + addOutput(createPort<Port24>(out4OutputPosition, PortWidget::OUTPUT, module, Manual::OUT4_OUTPUT)); + addOutput(createPort<Port24>(out5OutputPosition, PortWidget::OUTPUT, module, Manual::OUT5_OUTPUT)); + addOutput(createPort<Port24>(out6OutputPosition, PortWidget::OUTPUT, module, Manual::OUT6_OUTPUT)); + addOutput(createPort<Port24>(out7OutputPosition, PortWidget::OUTPUT, module, Manual::OUT7_OUTPUT)); + addOutput(createPort<Port24>(out8OutputPosition, PortWidget::OUTPUT, module, Manual::OUT8_OUTPUT)); } void appendContextMenu(Menu* menu) override { diff --git a/src/Matrix88.cpp b/src/Matrix88.cpp @@ -25,10 +25,10 @@ struct Matrix88Widget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(15, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 0))); - addChild(Widget::create<ScrewSilver>(Vec(15, 365))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 365))); + addChild(createWidget<ScrewSilver>(Vec(15, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0))); + addChild(createWidget<ScrewSilver>(Vec(15, 365))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 365))); // generated by svg_widgets.rb auto mix11ParamPosition = Vec(53.7, 32.2); @@ -116,89 +116,89 @@ struct Matrix88Widget : ModuleWidget { auto out8OutputPosition = Vec(296.5, 328.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob19>(mix11ParamPosition, module, Matrix88::MIX11_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix21ParamPosition, module, Matrix88::MIX21_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix31ParamPosition, module, Matrix88::MIX31_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix41ParamPosition, module, Matrix88::MIX41_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix51ParamPosition, module, Matrix88::MIX51_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix61ParamPosition, module, Matrix88::MIX61_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix71ParamPosition, module, Matrix88::MIX71_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix81ParamPosition, module, Matrix88::MIX81_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix12ParamPosition, module, Matrix88::MIX12_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix22ParamPosition, module, Matrix88::MIX22_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix32ParamPosition, module, Matrix88::MIX32_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix42ParamPosition, module, Matrix88::MIX42_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix52ParamPosition, module, Matrix88::MIX52_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix62ParamPosition, module, Matrix88::MIX62_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix72ParamPosition, module, Matrix88::MIX72_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix82ParamPosition, module, Matrix88::MIX82_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix13ParamPosition, module, Matrix88::MIX13_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix23ParamPosition, module, Matrix88::MIX23_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix33ParamPosition, module, Matrix88::MIX33_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix43ParamPosition, module, Matrix88::MIX43_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix53ParamPosition, module, Matrix88::MIX53_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix63ParamPosition, module, Matrix88::MIX63_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix73ParamPosition, module, Matrix88::MIX73_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix83ParamPosition, module, Matrix88::MIX83_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix14ParamPosition, module, Matrix88::MIX14_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix24ParamPosition, module, Matrix88::MIX24_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix34ParamPosition, module, Matrix88::MIX34_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix44ParamPosition, module, Matrix88::MIX44_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix54ParamPosition, module, Matrix88::MIX54_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix64ParamPosition, module, Matrix88::MIX64_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix74ParamPosition, module, Matrix88::MIX74_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix84ParamPosition, module, Matrix88::MIX84_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix15ParamPosition, module, Matrix88::MIX15_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix25ParamPosition, module, Matrix88::MIX25_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix35ParamPosition, module, Matrix88::MIX35_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix45ParamPosition, module, Matrix88::MIX45_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix55ParamPosition, module, Matrix88::MIX55_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix65ParamPosition, module, Matrix88::MIX65_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix75ParamPosition, module, Matrix88::MIX75_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix85ParamPosition, module, Matrix88::MIX85_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix16ParamPosition, module, Matrix88::MIX16_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix26ParamPosition, module, Matrix88::MIX26_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix36ParamPosition, module, Matrix88::MIX36_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix46ParamPosition, module, Matrix88::MIX46_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix56ParamPosition, module, Matrix88::MIX56_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix66ParamPosition, module, Matrix88::MIX66_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix76ParamPosition, module, Matrix88::MIX76_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix86ParamPosition, module, Matrix88::MIX86_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix17ParamPosition, module, Matrix88::MIX17_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix27ParamPosition, module, Matrix88::MIX27_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix37ParamPosition, module, Matrix88::MIX37_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix47ParamPosition, module, Matrix88::MIX47_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix57ParamPosition, module, Matrix88::MIX57_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix67ParamPosition, module, Matrix88::MIX67_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix77ParamPosition, module, Matrix88::MIX77_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix87ParamPosition, module, Matrix88::MIX87_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix18ParamPosition, module, Matrix88::MIX18_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix28ParamPosition, module, Matrix88::MIX28_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix38ParamPosition, module, Matrix88::MIX38_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix48ParamPosition, module, Matrix88::MIX48_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix58ParamPosition, module, Matrix88::MIX58_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix68ParamPosition, module, Matrix88::MIX68_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix78ParamPosition, module, Matrix88::MIX78_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob19>(mix88ParamPosition, module, Matrix88::MIX88_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob16>(levelParamPosition, module, Matrix88::LEVEL_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<Knob19>(mix11ParamPosition, module, Matrix88::MIX11_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix21ParamPosition, module, Matrix88::MIX21_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix31ParamPosition, module, Matrix88::MIX31_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix41ParamPosition, module, Matrix88::MIX41_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix51ParamPosition, module, Matrix88::MIX51_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix61ParamPosition, module, Matrix88::MIX61_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix71ParamPosition, module, Matrix88::MIX71_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix81ParamPosition, module, Matrix88::MIX81_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix12ParamPosition, module, Matrix88::MIX12_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix22ParamPosition, module, Matrix88::MIX22_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix32ParamPosition, module, Matrix88::MIX32_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix42ParamPosition, module, Matrix88::MIX42_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix52ParamPosition, module, Matrix88::MIX52_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix62ParamPosition, module, Matrix88::MIX62_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix72ParamPosition, module, Matrix88::MIX72_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix82ParamPosition, module, Matrix88::MIX82_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix13ParamPosition, module, Matrix88::MIX13_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix23ParamPosition, module, Matrix88::MIX23_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix33ParamPosition, module, Matrix88::MIX33_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix43ParamPosition, module, Matrix88::MIX43_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix53ParamPosition, module, Matrix88::MIX53_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix63ParamPosition, module, Matrix88::MIX63_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix73ParamPosition, module, Matrix88::MIX73_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix83ParamPosition, module, Matrix88::MIX83_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix14ParamPosition, module, Matrix88::MIX14_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix24ParamPosition, module, Matrix88::MIX24_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix34ParamPosition, module, Matrix88::MIX34_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix44ParamPosition, module, Matrix88::MIX44_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix54ParamPosition, module, Matrix88::MIX54_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix64ParamPosition, module, Matrix88::MIX64_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix74ParamPosition, module, Matrix88::MIX74_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix84ParamPosition, module, Matrix88::MIX84_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix15ParamPosition, module, Matrix88::MIX15_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix25ParamPosition, module, Matrix88::MIX25_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix35ParamPosition, module, Matrix88::MIX35_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix45ParamPosition, module, Matrix88::MIX45_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix55ParamPosition, module, Matrix88::MIX55_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix65ParamPosition, module, Matrix88::MIX65_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix75ParamPosition, module, Matrix88::MIX75_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix85ParamPosition, module, Matrix88::MIX85_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix16ParamPosition, module, Matrix88::MIX16_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix26ParamPosition, module, Matrix88::MIX26_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix36ParamPosition, module, Matrix88::MIX36_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix46ParamPosition, module, Matrix88::MIX46_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix56ParamPosition, module, Matrix88::MIX56_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix66ParamPosition, module, Matrix88::MIX66_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix76ParamPosition, module, Matrix88::MIX76_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix86ParamPosition, module, Matrix88::MIX86_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix17ParamPosition, module, Matrix88::MIX17_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix27ParamPosition, module, Matrix88::MIX27_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix37ParamPosition, module, Matrix88::MIX37_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix47ParamPosition, module, Matrix88::MIX47_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix57ParamPosition, module, Matrix88::MIX57_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix67ParamPosition, module, Matrix88::MIX67_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix77ParamPosition, module, Matrix88::MIX77_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix87ParamPosition, module, Matrix88::MIX87_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix18ParamPosition, module, Matrix88::MIX18_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix28ParamPosition, module, Matrix88::MIX28_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix38ParamPosition, module, Matrix88::MIX38_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix48ParamPosition, module, Matrix88::MIX48_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix58ParamPosition, module, Matrix88::MIX58_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix68ParamPosition, module, Matrix88::MIX68_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix78ParamPosition, module, Matrix88::MIX78_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob19>(mix88ParamPosition, module, Matrix88::MIX88_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob16>(levelParamPosition, module, Matrix88::LEVEL_PARAM, 0.0, 1.0, 1.0)); - addInput(Port::create<Port24>(in1InputPosition, Port::INPUT, module, Matrix88::IN1_INPUT)); - addInput(Port::create<Port24>(in2InputPosition, Port::INPUT, module, Matrix88::IN2_INPUT)); - addInput(Port::create<Port24>(in3InputPosition, Port::INPUT, module, Matrix88::IN3_INPUT)); - addInput(Port::create<Port24>(in4InputPosition, Port::INPUT, module, Matrix88::IN4_INPUT)); - addInput(Port::create<Port24>(in5InputPosition, Port::INPUT, module, Matrix88::IN5_INPUT)); - addInput(Port::create<Port24>(in6InputPosition, Port::INPUT, module, Matrix88::IN6_INPUT)); - addInput(Port::create<Port24>(in7InputPosition, Port::INPUT, module, Matrix88::IN7_INPUT)); - addInput(Port::create<Port24>(in8InputPosition, Port::INPUT, module, Matrix88::IN8_INPUT)); + addInput(createPort<Port24>(in1InputPosition, PortWidget::INPUT, module, Matrix88::IN1_INPUT)); + addInput(createPort<Port24>(in2InputPosition, PortWidget::INPUT, module, Matrix88::IN2_INPUT)); + addInput(createPort<Port24>(in3InputPosition, PortWidget::INPUT, module, Matrix88::IN3_INPUT)); + addInput(createPort<Port24>(in4InputPosition, PortWidget::INPUT, module, Matrix88::IN4_INPUT)); + addInput(createPort<Port24>(in5InputPosition, PortWidget::INPUT, module, Matrix88::IN5_INPUT)); + addInput(createPort<Port24>(in6InputPosition, PortWidget::INPUT, module, Matrix88::IN6_INPUT)); + addInput(createPort<Port24>(in7InputPosition, PortWidget::INPUT, module, Matrix88::IN7_INPUT)); + addInput(createPort<Port24>(in8InputPosition, PortWidget::INPUT, module, Matrix88::IN8_INPUT)); - addOutput(Port::create<Port24>(out1OutputPosition, Port::OUTPUT, module, Matrix88::OUT1_OUTPUT)); - addOutput(Port::create<Port24>(out2OutputPosition, Port::OUTPUT, module, Matrix88::OUT2_OUTPUT)); - addOutput(Port::create<Port24>(out3OutputPosition, Port::OUTPUT, module, Matrix88::OUT3_OUTPUT)); - addOutput(Port::create<Port24>(out4OutputPosition, Port::OUTPUT, module, Matrix88::OUT4_OUTPUT)); - addOutput(Port::create<Port24>(out5OutputPosition, Port::OUTPUT, module, Matrix88::OUT5_OUTPUT)); - addOutput(Port::create<Port24>(out6OutputPosition, Port::OUTPUT, module, Matrix88::OUT6_OUTPUT)); - addOutput(Port::create<Port24>(out7OutputPosition, Port::OUTPUT, module, Matrix88::OUT7_OUTPUT)); - addOutput(Port::create<Port24>(out8OutputPosition, Port::OUTPUT, module, Matrix88::OUT8_OUTPUT)); + addOutput(createPort<Port24>(out1OutputPosition, PortWidget::OUTPUT, module, Matrix88::OUT1_OUTPUT)); + addOutput(createPort<Port24>(out2OutputPosition, PortWidget::OUTPUT, module, Matrix88::OUT2_OUTPUT)); + addOutput(createPort<Port24>(out3OutputPosition, PortWidget::OUTPUT, module, Matrix88::OUT3_OUTPUT)); + addOutput(createPort<Port24>(out4OutputPosition, PortWidget::OUTPUT, module, Matrix88::OUT4_OUTPUT)); + addOutput(createPort<Port24>(out5OutputPosition, PortWidget::OUTPUT, module, Matrix88::OUT5_OUTPUT)); + addOutput(createPort<Port24>(out6OutputPosition, PortWidget::OUTPUT, module, Matrix88::OUT6_OUTPUT)); + addOutput(createPort<Port24>(out7OutputPosition, PortWidget::OUTPUT, module, Matrix88::OUT7_OUTPUT)); + addOutput(createPort<Port24>(out8OutputPosition, PortWidget::OUTPUT, module, Matrix88::OUT8_OUTPUT)); } }; diff --git a/src/Mix1.cpp b/src/Mix1.cpp @@ -23,8 +23,8 @@ struct Mix1Widget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto levelParamPosition = Vec(13.5, 18.0); @@ -38,7 +38,7 @@ struct Mix1Widget : ModuleWidget { // end generated by svg_widgets.rb { - auto slider = ParamWidget::create<VUSlider151>( + auto slider = createParam<VUSlider151>( levelParamPosition, module, Mix1::LEVEL_PARAM, @@ -49,13 +49,13 @@ struct Mix1Widget : ModuleWidget { dynamic_cast<VUSlider*>(slider)->setVULevel(&module->_channel.rms); addParam(slider); } - addParam(ParamWidget::create<MuteButton>(muteParamPosition, module, Mix1::MUTE_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<MuteButton>(muteParamPosition, module, Mix1::MUTE_PARAM, 0.0, 1.0, 0.0)); - addInput(Port::create<Port24>(muteInputPosition, Port::INPUT, module, Mix1::MUTE_INPUT)); - addInput(Port::create<Port24>(levelInputPosition, Port::INPUT, module, Mix1::LEVEL_INPUT)); - addInput(Port::create<Port24>(inInputPosition, Port::INPUT, module, Mix1::IN_INPUT)); + addInput(createPort<Port24>(muteInputPosition, PortWidget::INPUT, module, Mix1::MUTE_INPUT)); + addInput(createPort<Port24>(levelInputPosition, PortWidget::INPUT, module, Mix1::LEVEL_INPUT)); + addInput(createPort<Port24>(inInputPosition, PortWidget::INPUT, module, Mix1::IN_INPUT)); - addOutput(Port::create<Port24>(outOutputPosition, Port::OUTPUT, module, Mix1::OUT_OUTPUT)); + addOutput(createPort<Port24>(outOutputPosition, PortWidget::OUTPUT, module, Mix1::OUT_OUTPUT)); } }; diff --git a/src/Mix4.cpp b/src/Mix4.cpp @@ -80,10 +80,10 @@ struct Mix4Widget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(15, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 0))); - addChild(Widget::create<ScrewSilver>(Vec(15, 365))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 365))); + addChild(createWidget<ScrewSilver>(Vec(15, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0))); + addChild(createWidget<ScrewSilver>(Vec(15, 365))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 365))); // generated by svg_widgets.rb auto level1ParamPosition = Vec(17.5, 32.0); @@ -120,40 +120,40 @@ struct Mix4Widget : ModuleWidget { // end generated by svg_widgets.rb addSlider(level1ParamPosition, module, Mix4::LEVEL1_PARAM, module->_channel1.rms); - addParam(ParamWidget::create<Knob16>(pan1ParamPosition, module, Mix4::PAN1_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<SoloMuteButton>(mute1ParamPosition, module, Mix4::MUTE1_PARAM, 0.0, 3.0, 0.0)); + addParam(createParam<Knob16>(pan1ParamPosition, module, Mix4::PAN1_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<SoloMuteButton>(mute1ParamPosition, module, Mix4::MUTE1_PARAM, 0.0, 3.0, 0.0)); addSlider(level2ParamPosition, module, Mix4::LEVEL2_PARAM, module->_channel2.rms); - addParam(ParamWidget::create<Knob16>(pan2ParamPosition, module, Mix4::PAN2_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<SoloMuteButton>(mute2ParamPosition, module, Mix4::MUTE2_PARAM, 0.0, 3.0, 0.0)); + addParam(createParam<Knob16>(pan2ParamPosition, module, Mix4::PAN2_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<SoloMuteButton>(mute2ParamPosition, module, Mix4::MUTE2_PARAM, 0.0, 3.0, 0.0)); addSlider(level3ParamPosition, module, Mix4::LEVEL3_PARAM, module->_channel3.rms); - addParam(ParamWidget::create<Knob16>(pan3ParamPosition, module, Mix4::PAN3_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<SoloMuteButton>(mute3ParamPosition, module, Mix4::MUTE3_PARAM, 0.0, 3.0, 0.0)); + addParam(createParam<Knob16>(pan3ParamPosition, module, Mix4::PAN3_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<SoloMuteButton>(mute3ParamPosition, module, Mix4::MUTE3_PARAM, 0.0, 3.0, 0.0)); addSlider(level4ParamPosition, module, Mix4::LEVEL4_PARAM, module->_channel4.rms); - addParam(ParamWidget::create<Knob16>(pan4ParamPosition, module, Mix4::PAN4_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<SoloMuteButton>(mute4ParamPosition, module, Mix4::MUTE4_PARAM, 0.0, 3.0, 0.0)); + addParam(createParam<Knob16>(pan4ParamPosition, module, Mix4::PAN4_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<SoloMuteButton>(mute4ParamPosition, module, Mix4::MUTE4_PARAM, 0.0, 3.0, 0.0)); addSlider(mixParamPosition, module, Mix4::MIX_PARAM, module->_rmsLevel); - addParam(ParamWidget::create<MuteButton>(mixMuteParamPosition, module, Mix4::MIX_MUTE_PARAM, 0.0, 1.0, 0.0)); - - addInput(Port::create<Port24>(cv1InputPosition, Port::INPUT, module, Mix4::CV1_INPUT)); - addInput(Port::create<Port24>(pan1InputPosition, Port::INPUT, module, Mix4::PAN1_INPUT)); - addInput(Port::create<Port24>(in1InputPosition, Port::INPUT, module, Mix4::IN1_INPUT)); - addInput(Port::create<Port24>(cv2InputPosition, Port::INPUT, module, Mix4::CV2_INPUT)); - addInput(Port::create<Port24>(pan2InputPosition, Port::INPUT, module, Mix4::PAN2_INPUT)); - addInput(Port::create<Port24>(in2InputPosition, Port::INPUT, module, Mix4::IN2_INPUT)); - addInput(Port::create<Port24>(cv3InputPosition, Port::INPUT, module, Mix4::CV3_INPUT)); - addInput(Port::create<Port24>(pan3InputPosition, Port::INPUT, module, Mix4::PAN3_INPUT)); - addInput(Port::create<Port24>(in3InputPosition, Port::INPUT, module, Mix4::IN3_INPUT)); - addInput(Port::create<Port24>(cv4InputPosition, Port::INPUT, module, Mix4::CV4_INPUT)); - addInput(Port::create<Port24>(pan4InputPosition, Port::INPUT, module, Mix4::PAN4_INPUT)); - addInput(Port::create<Port24>(in4InputPosition, Port::INPUT, module, Mix4::IN4_INPUT)); - addInput(Port::create<Port24>(mixCvInputPosition, Port::INPUT, module, Mix4::MIX_CV_INPUT)); - - addOutput(Port::create<Port24>(lOutputPosition, Port::OUTPUT, module, Mix4::L_OUTPUT)); - addOutput(Port::create<Port24>(rOutputPosition, Port::OUTPUT, module, Mix4::R_OUTPUT)); + addParam(createParam<MuteButton>(mixMuteParamPosition, module, Mix4::MIX_MUTE_PARAM, 0.0, 1.0, 0.0)); + + addInput(createPort<Port24>(cv1InputPosition, PortWidget::INPUT, module, Mix4::CV1_INPUT)); + addInput(createPort<Port24>(pan1InputPosition, PortWidget::INPUT, module, Mix4::PAN1_INPUT)); + addInput(createPort<Port24>(in1InputPosition, PortWidget::INPUT, module, Mix4::IN1_INPUT)); + addInput(createPort<Port24>(cv2InputPosition, PortWidget::INPUT, module, Mix4::CV2_INPUT)); + addInput(createPort<Port24>(pan2InputPosition, PortWidget::INPUT, module, Mix4::PAN2_INPUT)); + addInput(createPort<Port24>(in2InputPosition, PortWidget::INPUT, module, Mix4::IN2_INPUT)); + addInput(createPort<Port24>(cv3InputPosition, PortWidget::INPUT, module, Mix4::CV3_INPUT)); + addInput(createPort<Port24>(pan3InputPosition, PortWidget::INPUT, module, Mix4::PAN3_INPUT)); + addInput(createPort<Port24>(in3InputPosition, PortWidget::INPUT, module, Mix4::IN3_INPUT)); + addInput(createPort<Port24>(cv4InputPosition, PortWidget::INPUT, module, Mix4::CV4_INPUT)); + addInput(createPort<Port24>(pan4InputPosition, PortWidget::INPUT, module, Mix4::PAN4_INPUT)); + addInput(createPort<Port24>(in4InputPosition, PortWidget::INPUT, module, Mix4::IN4_INPUT)); + addInput(createPort<Port24>(mixCvInputPosition, PortWidget::INPUT, module, Mix4::MIX_CV_INPUT)); + + addOutput(createPort<Port24>(lOutputPosition, PortWidget::OUTPUT, module, Mix4::L_OUTPUT)); + addOutput(createPort<Port24>(rOutputPosition, PortWidget::OUTPUT, module, Mix4::R_OUTPUT)); } void addSlider(Vec position, Mix4* module, int id, float& rms) { - auto slider = ParamWidget::create<VUSlider151>( + auto slider = createParam<VUSlider151>( position, module, id, diff --git a/src/Mix8.cpp b/src/Mix8.cpp @@ -104,10 +104,10 @@ struct Mix8Widget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(15, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 0))); - addChild(Widget::create<ScrewSilver>(Vec(15, 365))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 365))); + addChild(createWidget<ScrewSilver>(Vec(15, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0))); + addChild(createWidget<ScrewSilver>(Vec(15, 365))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 365))); // generated by svg_widgets.rb auto level1ParamPosition = Vec(17.5, 32.0); @@ -168,64 +168,64 @@ struct Mix8Widget : ModuleWidget { // end generated by svg_widgets.rb addSlider(level1ParamPosition, module, Mix8::LEVEL1_PARAM, module->_channel1.rms); - addParam(ParamWidget::create<SoloMuteButton>(mute1ParamPosition, module, Mix8::MUTE1_PARAM, 0.0, 3.0, 0.0)); - addParam(ParamWidget::create<Knob16>(pan1ParamPosition, module, Mix8::PAN1_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<SoloMuteButton>(mute1ParamPosition, module, Mix8::MUTE1_PARAM, 0.0, 3.0, 0.0)); + addParam(createParam<Knob16>(pan1ParamPosition, module, Mix8::PAN1_PARAM, -1.0, 1.0, 0.0)); addSlider(level2ParamPosition, module, Mix8::LEVEL2_PARAM, module->_channel2.rms); - addParam(ParamWidget::create<SoloMuteButton>(mute2ParamPosition, module, Mix8::MUTE2_PARAM, 0.0, 3.0, 0.0)); - addParam(ParamWidget::create<Knob16>(pan2ParamPosition, module, Mix8::PAN2_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<SoloMuteButton>(mute2ParamPosition, module, Mix8::MUTE2_PARAM, 0.0, 3.0, 0.0)); + addParam(createParam<Knob16>(pan2ParamPosition, module, Mix8::PAN2_PARAM, -1.0, 1.0, 0.0)); addSlider(level3ParamPosition, module, Mix8::LEVEL3_PARAM, module->_channel3.rms); - addParam(ParamWidget::create<SoloMuteButton>(mute3ParamPosition, module, Mix8::MUTE3_PARAM, 0.0, 3.0, 0.0)); - addParam(ParamWidget::create<Knob16>(pan3ParamPosition, module, Mix8::PAN3_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<SoloMuteButton>(mute3ParamPosition, module, Mix8::MUTE3_PARAM, 0.0, 3.0, 0.0)); + addParam(createParam<Knob16>(pan3ParamPosition, module, Mix8::PAN3_PARAM, -1.0, 1.0, 0.0)); addSlider(level4ParamPosition, module, Mix8::LEVEL4_PARAM, module->_channel4.rms); - addParam(ParamWidget::create<SoloMuteButton>(mute4ParamPosition, module, Mix8::MUTE4_PARAM, 0.0, 3.0, 0.0)); - addParam(ParamWidget::create<Knob16>(pan4ParamPosition, module, Mix8::PAN4_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<SoloMuteButton>(mute4ParamPosition, module, Mix8::MUTE4_PARAM, 0.0, 3.0, 0.0)); + addParam(createParam<Knob16>(pan4ParamPosition, module, Mix8::PAN4_PARAM, -1.0, 1.0, 0.0)); addSlider(level5ParamPosition, module, Mix8::LEVEL5_PARAM, module->_channel5.rms); - addParam(ParamWidget::create<SoloMuteButton>(mute5ParamPosition, module, Mix8::MUTE5_PARAM, 0.0, 3.0, 0.0)); - addParam(ParamWidget::create<Knob16>(pan5ParamPosition, module, Mix8::PAN5_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<SoloMuteButton>(mute5ParamPosition, module, Mix8::MUTE5_PARAM, 0.0, 3.0, 0.0)); + addParam(createParam<Knob16>(pan5ParamPosition, module, Mix8::PAN5_PARAM, -1.0, 1.0, 0.0)); addSlider(level6ParamPosition, module, Mix8::LEVEL6_PARAM, module->_channel6.rms); - addParam(ParamWidget::create<SoloMuteButton>(mute6ParamPosition, module, Mix8::MUTE6_PARAM, 0.0, 3.0, 0.0)); - addParam(ParamWidget::create<Knob16>(pan6ParamPosition, module, Mix8::PAN6_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<SoloMuteButton>(mute6ParamPosition, module, Mix8::MUTE6_PARAM, 0.0, 3.0, 0.0)); + addParam(createParam<Knob16>(pan6ParamPosition, module, Mix8::PAN6_PARAM, -1.0, 1.0, 0.0)); addSlider(level7ParamPosition, module, Mix8::LEVEL7_PARAM, module->_channel7.rms); - addParam(ParamWidget::create<SoloMuteButton>(mute7ParamPosition, module, Mix8::MUTE7_PARAM, 0.0, 3.0, 0.0)); - addParam(ParamWidget::create<Knob16>(pan7ParamPosition, module, Mix8::PAN7_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<SoloMuteButton>(mute7ParamPosition, module, Mix8::MUTE7_PARAM, 0.0, 3.0, 0.0)); + addParam(createParam<Knob16>(pan7ParamPosition, module, Mix8::PAN7_PARAM, -1.0, 1.0, 0.0)); addSlider(level8ParamPosition, module, Mix8::LEVEL8_PARAM, module->_channel8.rms); - addParam(ParamWidget::create<SoloMuteButton>(mute8ParamPosition, module, Mix8::MUTE8_PARAM, 0.0, 3.0, 0.0)); - addParam(ParamWidget::create<Knob16>(pan8ParamPosition, module, Mix8::PAN8_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<SoloMuteButton>(mute8ParamPosition, module, Mix8::MUTE8_PARAM, 0.0, 3.0, 0.0)); + addParam(createParam<Knob16>(pan8ParamPosition, module, Mix8::PAN8_PARAM, -1.0, 1.0, 0.0)); addSlider(mixParamPosition, module, Mix8::MIX_PARAM, module->_rmsLevel); - addParam(ParamWidget::create<MuteButton>(mixMuteParamPosition, module, Mix8::MIX_MUTE_PARAM, 0.0, 1.0, 0.0)); - - addInput(Port::create<Port24>(cv1InputPosition, Port::INPUT, module, Mix8::CV1_INPUT)); - addInput(Port::create<Port24>(pan1InputPosition, Port::INPUT, module, Mix8::PAN1_INPUT)); - addInput(Port::create<Port24>(in1InputPosition, Port::INPUT, module, Mix8::IN1_INPUT)); - addInput(Port::create<Port24>(cv2InputPosition, Port::INPUT, module, Mix8::CV2_INPUT)); - addInput(Port::create<Port24>(pan2InputPosition, Port::INPUT, module, Mix8::PAN2_INPUT)); - addInput(Port::create<Port24>(in2InputPosition, Port::INPUT, module, Mix8::IN2_INPUT)); - addInput(Port::create<Port24>(cv3InputPosition, Port::INPUT, module, Mix8::CV3_INPUT)); - addInput(Port::create<Port24>(pan3InputPosition, Port::INPUT, module, Mix8::PAN3_INPUT)); - addInput(Port::create<Port24>(in3InputPosition, Port::INPUT, module, Mix8::IN3_INPUT)); - addInput(Port::create<Port24>(cv4InputPosition, Port::INPUT, module, Mix8::CV4_INPUT)); - addInput(Port::create<Port24>(pan4InputPosition, Port::INPUT, module, Mix8::PAN4_INPUT)); - addInput(Port::create<Port24>(in4InputPosition, Port::INPUT, module, Mix8::IN4_INPUT)); - addInput(Port::create<Port24>(cv5InputPosition, Port::INPUT, module, Mix8::CV5_INPUT)); - addInput(Port::create<Port24>(pan5InputPosition, Port::INPUT, module, Mix8::PAN5_INPUT)); - addInput(Port::create<Port24>(in5InputPosition, Port::INPUT, module, Mix8::IN5_INPUT)); - addInput(Port::create<Port24>(cv6InputPosition, Port::INPUT, module, Mix8::CV6_INPUT)); - addInput(Port::create<Port24>(pan6InputPosition, Port::INPUT, module, Mix8::PAN6_INPUT)); - addInput(Port::create<Port24>(in6InputPosition, Port::INPUT, module, Mix8::IN6_INPUT)); - addInput(Port::create<Port24>(cv7InputPosition, Port::INPUT, module, Mix8::CV7_INPUT)); - addInput(Port::create<Port24>(pan7InputPosition, Port::INPUT, module, Mix8::PAN7_INPUT)); - addInput(Port::create<Port24>(in7InputPosition, Port::INPUT, module, Mix8::IN7_INPUT)); - addInput(Port::create<Port24>(cv8InputPosition, Port::INPUT, module, Mix8::CV8_INPUT)); - addInput(Port::create<Port24>(pan8InputPosition, Port::INPUT, module, Mix8::PAN8_INPUT)); - addInput(Port::create<Port24>(in8InputPosition, Port::INPUT, module, Mix8::IN8_INPUT)); - addInput(Port::create<Port24>(mixCvInputPosition, Port::INPUT, module, Mix8::MIX_CV_INPUT)); - - addOutput(Port::create<Port24>(lOutputPosition, Port::OUTPUT, module, Mix8::L_OUTPUT)); - addOutput(Port::create<Port24>(rOutputPosition, Port::OUTPUT, module, Mix8::R_OUTPUT)); + addParam(createParam<MuteButton>(mixMuteParamPosition, module, Mix8::MIX_MUTE_PARAM, 0.0, 1.0, 0.0)); + + addInput(createPort<Port24>(cv1InputPosition, PortWidget::INPUT, module, Mix8::CV1_INPUT)); + addInput(createPort<Port24>(pan1InputPosition, PortWidget::INPUT, module, Mix8::PAN1_INPUT)); + addInput(createPort<Port24>(in1InputPosition, PortWidget::INPUT, module, Mix8::IN1_INPUT)); + addInput(createPort<Port24>(cv2InputPosition, PortWidget::INPUT, module, Mix8::CV2_INPUT)); + addInput(createPort<Port24>(pan2InputPosition, PortWidget::INPUT, module, Mix8::PAN2_INPUT)); + addInput(createPort<Port24>(in2InputPosition, PortWidget::INPUT, module, Mix8::IN2_INPUT)); + addInput(createPort<Port24>(cv3InputPosition, PortWidget::INPUT, module, Mix8::CV3_INPUT)); + addInput(createPort<Port24>(pan3InputPosition, PortWidget::INPUT, module, Mix8::PAN3_INPUT)); + addInput(createPort<Port24>(in3InputPosition, PortWidget::INPUT, module, Mix8::IN3_INPUT)); + addInput(createPort<Port24>(cv4InputPosition, PortWidget::INPUT, module, Mix8::CV4_INPUT)); + addInput(createPort<Port24>(pan4InputPosition, PortWidget::INPUT, module, Mix8::PAN4_INPUT)); + addInput(createPort<Port24>(in4InputPosition, PortWidget::INPUT, module, Mix8::IN4_INPUT)); + addInput(createPort<Port24>(cv5InputPosition, PortWidget::INPUT, module, Mix8::CV5_INPUT)); + addInput(createPort<Port24>(pan5InputPosition, PortWidget::INPUT, module, Mix8::PAN5_INPUT)); + addInput(createPort<Port24>(in5InputPosition, PortWidget::INPUT, module, Mix8::IN5_INPUT)); + addInput(createPort<Port24>(cv6InputPosition, PortWidget::INPUT, module, Mix8::CV6_INPUT)); + addInput(createPort<Port24>(pan6InputPosition, PortWidget::INPUT, module, Mix8::PAN6_INPUT)); + addInput(createPort<Port24>(in6InputPosition, PortWidget::INPUT, module, Mix8::IN6_INPUT)); + addInput(createPort<Port24>(cv7InputPosition, PortWidget::INPUT, module, Mix8::CV7_INPUT)); + addInput(createPort<Port24>(pan7InputPosition, PortWidget::INPUT, module, Mix8::PAN7_INPUT)); + addInput(createPort<Port24>(in7InputPosition, PortWidget::INPUT, module, Mix8::IN7_INPUT)); + addInput(createPort<Port24>(cv8InputPosition, PortWidget::INPUT, module, Mix8::CV8_INPUT)); + addInput(createPort<Port24>(pan8InputPosition, PortWidget::INPUT, module, Mix8::PAN8_INPUT)); + addInput(createPort<Port24>(in8InputPosition, PortWidget::INPUT, module, Mix8::IN8_INPUT)); + addInput(createPort<Port24>(mixCvInputPosition, PortWidget::INPUT, module, Mix8::MIX_CV_INPUT)); + + addOutput(createPort<Port24>(lOutputPosition, PortWidget::OUTPUT, module, Mix8::L_OUTPUT)); + addOutput(createPort<Port24>(rOutputPosition, PortWidget::OUTPUT, module, Mix8::R_OUTPUT)); } void addSlider(Vec position, Mix8* module, int id, float& rms) { - auto slider = ParamWidget::create<VUSlider151>( + auto slider = createParam<VUSlider151>( position, module, id, diff --git a/src/Mult.cpp b/src/Mult.cpp @@ -28,8 +28,8 @@ struct MultWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto inaInputPosition = Vec(10.5, 21.0); @@ -43,15 +43,15 @@ struct MultWidget : ModuleWidget { auto outb3OutputPosition = Vec(10.5, 282.0); // end generated by svg_widgets.rb - addInput(Port::create<Port24>(inaInputPosition, Port::INPUT, module, Mult::INA_INPUT)); - addInput(Port::create<Port24>(inbInputPosition, Port::INPUT, module, Mult::INB_INPUT)); + addInput(createPort<Port24>(inaInputPosition, PortWidget::INPUT, module, Mult::INA_INPUT)); + addInput(createPort<Port24>(inbInputPosition, PortWidget::INPUT, module, Mult::INB_INPUT)); - addOutput(Port::create<Port24>(outa1OutputPosition, Port::OUTPUT, module, Mult::OUTA1_OUTPUT)); - addOutput(Port::create<Port24>(outa2OutputPosition, Port::OUTPUT, module, Mult::OUTA2_OUTPUT)); - addOutput(Port::create<Port24>(outa3OutputPosition, Port::OUTPUT, module, Mult::OUTA3_OUTPUT)); - addOutput(Port::create<Port24>(outb1OutputPosition, Port::OUTPUT, module, Mult::OUTB1_OUTPUT)); - addOutput(Port::create<Port24>(outb2OutputPosition, Port::OUTPUT, module, Mult::OUTB2_OUTPUT)); - addOutput(Port::create<Port24>(outb3OutputPosition, Port::OUTPUT, module, Mult::OUTB3_OUTPUT)); + addOutput(createPort<Port24>(outa1OutputPosition, PortWidget::OUTPUT, module, Mult::OUTA1_OUTPUT)); + addOutput(createPort<Port24>(outa2OutputPosition, PortWidget::OUTPUT, module, Mult::OUTA2_OUTPUT)); + addOutput(createPort<Port24>(outa3OutputPosition, PortWidget::OUTPUT, module, Mult::OUTA3_OUTPUT)); + addOutput(createPort<Port24>(outb1OutputPosition, PortWidget::OUTPUT, module, Mult::OUTB1_OUTPUT)); + addOutput(createPort<Port24>(outb2OutputPosition, PortWidget::OUTPUT, module, Mult::OUTB2_OUTPUT)); + addOutput(createPort<Port24>(outb3OutputPosition, PortWidget::OUTPUT, module, Mult::OUTB3_OUTPUT)); } }; diff --git a/src/Mute8.cpp b/src/Mute8.cpp @@ -56,10 +56,10 @@ struct Mute8Widget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 0))); - addChild(Widget::create<ScrewSilver>(Vec(0, 365))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 0))); + addChild(createWidget<ScrewSilver>(Vec(0, 365))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto mute1ParamPosition = Vec(78.2, 40.7); @@ -107,49 +107,49 @@ struct Mute8Widget : ModuleWidget { auto mute8LightPosition = Vec(100.5, 324.8); // end generated by svg_widgets.rb - addParam(ParamWidget::create<SoloMuteButton>(mute1ParamPosition, module, Mute8::MUTE1_PARAM, 0.0, 3.0, 0.0)); - addParam(ParamWidget::create<SoloMuteButton>(mute2ParamPosition, module, Mute8::MUTE2_PARAM, 0.0, 3.0, 0.0)); - addParam(ParamWidget::create<SoloMuteButton>(mute3ParamPosition, module, Mute8::MUTE3_PARAM, 0.0, 3.0, 0.0)); - addParam(ParamWidget::create<SoloMuteButton>(mute4ParamPosition, module, Mute8::MUTE4_PARAM, 0.0, 3.0, 0.0)); - addParam(ParamWidget::create<SoloMuteButton>(mute5ParamPosition, module, Mute8::MUTE5_PARAM, 0.0, 3.0, 0.0)); - addParam(ParamWidget::create<SoloMuteButton>(mute6ParamPosition, module, Mute8::MUTE6_PARAM, 0.0, 3.0, 0.0)); - addParam(ParamWidget::create<SoloMuteButton>(mute7ParamPosition, module, Mute8::MUTE7_PARAM, 0.0, 3.0, 0.0)); - addParam(ParamWidget::create<SoloMuteButton>(mute8ParamPosition, module, Mute8::MUTE8_PARAM, 0.0, 3.0, 0.0)); - - addInput(Port::create<Port24>(input1InputPosition, Port::INPUT, module, Mute8::INPUT1_INPUT)); - addInput(Port::create<Port24>(input2InputPosition, Port::INPUT, module, Mute8::INPUT2_INPUT)); - addInput(Port::create<Port24>(input3InputPosition, Port::INPUT, module, Mute8::INPUT3_INPUT)); - addInput(Port::create<Port24>(input4InputPosition, Port::INPUT, module, Mute8::INPUT4_INPUT)); - addInput(Port::create<Port24>(input5InputPosition, Port::INPUT, module, Mute8::INPUT5_INPUT)); - addInput(Port::create<Port24>(input6InputPosition, Port::INPUT, module, Mute8::INPUT6_INPUT)); - addInput(Port::create<Port24>(input7InputPosition, Port::INPUT, module, Mute8::INPUT7_INPUT)); - addInput(Port::create<Port24>(input8InputPosition, Port::INPUT, module, Mute8::INPUT8_INPUT)); - addInput(Port::create<Port24>(mute1InputPosition, Port::INPUT, module, Mute8::MUTE1_INPUT)); - addInput(Port::create<Port24>(mute2InputPosition, Port::INPUT, module, Mute8::MUTE2_INPUT)); - addInput(Port::create<Port24>(mute3InputPosition, Port::INPUT, module, Mute8::MUTE3_INPUT)); - addInput(Port::create<Port24>(mute4InputPosition, Port::INPUT, module, Mute8::MUTE4_INPUT)); - addInput(Port::create<Port24>(mute5InputPosition, Port::INPUT, module, Mute8::MUTE5_INPUT)); - addInput(Port::create<Port24>(mute6InputPosition, Port::INPUT, module, Mute8::MUTE6_INPUT)); - addInput(Port::create<Port24>(mute7InputPosition, Port::INPUT, module, Mute8::MUTE7_INPUT)); - addInput(Port::create<Port24>(mute8InputPosition, Port::INPUT, module, Mute8::MUTE8_INPUT)); - - addOutput(Port::create<Port24>(output1OutputPosition, Port::OUTPUT, module, Mute8::OUTPUT1_OUTPUT)); - addOutput(Port::create<Port24>(output2OutputPosition, Port::OUTPUT, module, Mute8::OUTPUT2_OUTPUT)); - addOutput(Port::create<Port24>(output3OutputPosition, Port::OUTPUT, module, Mute8::OUTPUT3_OUTPUT)); - addOutput(Port::create<Port24>(output4OutputPosition, Port::OUTPUT, module, Mute8::OUTPUT4_OUTPUT)); - addOutput(Port::create<Port24>(output5OutputPosition, Port::OUTPUT, module, Mute8::OUTPUT5_OUTPUT)); - addOutput(Port::create<Port24>(output6OutputPosition, Port::OUTPUT, module, Mute8::OUTPUT6_OUTPUT)); - addOutput(Port::create<Port24>(output7OutputPosition, Port::OUTPUT, module, Mute8::OUTPUT7_OUTPUT)); - addOutput(Port::create<Port24>(output8OutputPosition, Port::OUTPUT, module, Mute8::OUTPUT8_OUTPUT)); - - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(mute1LightPosition, module, Mute8::MUTE1_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(mute2LightPosition, module, Mute8::MUTE2_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(mute3LightPosition, module, Mute8::MUTE3_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(mute4LightPosition, module, Mute8::MUTE4_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(mute5LightPosition, module, Mute8::MUTE5_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(mute6LightPosition, module, Mute8::MUTE6_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(mute7LightPosition, module, Mute8::MUTE7_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(mute8LightPosition, module, Mute8::MUTE8_LIGHT)); + addParam(createParam<SoloMuteButton>(mute1ParamPosition, module, Mute8::MUTE1_PARAM, 0.0, 3.0, 0.0)); + addParam(createParam<SoloMuteButton>(mute2ParamPosition, module, Mute8::MUTE2_PARAM, 0.0, 3.0, 0.0)); + addParam(createParam<SoloMuteButton>(mute3ParamPosition, module, Mute8::MUTE3_PARAM, 0.0, 3.0, 0.0)); + addParam(createParam<SoloMuteButton>(mute4ParamPosition, module, Mute8::MUTE4_PARAM, 0.0, 3.0, 0.0)); + addParam(createParam<SoloMuteButton>(mute5ParamPosition, module, Mute8::MUTE5_PARAM, 0.0, 3.0, 0.0)); + addParam(createParam<SoloMuteButton>(mute6ParamPosition, module, Mute8::MUTE6_PARAM, 0.0, 3.0, 0.0)); + addParam(createParam<SoloMuteButton>(mute7ParamPosition, module, Mute8::MUTE7_PARAM, 0.0, 3.0, 0.0)); + addParam(createParam<SoloMuteButton>(mute8ParamPosition, module, Mute8::MUTE8_PARAM, 0.0, 3.0, 0.0)); + + addInput(createPort<Port24>(input1InputPosition, PortWidget::INPUT, module, Mute8::INPUT1_INPUT)); + addInput(createPort<Port24>(input2InputPosition, PortWidget::INPUT, module, Mute8::INPUT2_INPUT)); + addInput(createPort<Port24>(input3InputPosition, PortWidget::INPUT, module, Mute8::INPUT3_INPUT)); + addInput(createPort<Port24>(input4InputPosition, PortWidget::INPUT, module, Mute8::INPUT4_INPUT)); + addInput(createPort<Port24>(input5InputPosition, PortWidget::INPUT, module, Mute8::INPUT5_INPUT)); + addInput(createPort<Port24>(input6InputPosition, PortWidget::INPUT, module, Mute8::INPUT6_INPUT)); + addInput(createPort<Port24>(input7InputPosition, PortWidget::INPUT, module, Mute8::INPUT7_INPUT)); + addInput(createPort<Port24>(input8InputPosition, PortWidget::INPUT, module, Mute8::INPUT8_INPUT)); + addInput(createPort<Port24>(mute1InputPosition, PortWidget::INPUT, module, Mute8::MUTE1_INPUT)); + addInput(createPort<Port24>(mute2InputPosition, PortWidget::INPUT, module, Mute8::MUTE2_INPUT)); + addInput(createPort<Port24>(mute3InputPosition, PortWidget::INPUT, module, Mute8::MUTE3_INPUT)); + addInput(createPort<Port24>(mute4InputPosition, PortWidget::INPUT, module, Mute8::MUTE4_INPUT)); + addInput(createPort<Port24>(mute5InputPosition, PortWidget::INPUT, module, Mute8::MUTE5_INPUT)); + addInput(createPort<Port24>(mute6InputPosition, PortWidget::INPUT, module, Mute8::MUTE6_INPUT)); + addInput(createPort<Port24>(mute7InputPosition, PortWidget::INPUT, module, Mute8::MUTE7_INPUT)); + addInput(createPort<Port24>(mute8InputPosition, PortWidget::INPUT, module, Mute8::MUTE8_INPUT)); + + addOutput(createPort<Port24>(output1OutputPosition, PortWidget::OUTPUT, module, Mute8::OUTPUT1_OUTPUT)); + addOutput(createPort<Port24>(output2OutputPosition, PortWidget::OUTPUT, module, Mute8::OUTPUT2_OUTPUT)); + addOutput(createPort<Port24>(output3OutputPosition, PortWidget::OUTPUT, module, Mute8::OUTPUT3_OUTPUT)); + addOutput(createPort<Port24>(output4OutputPosition, PortWidget::OUTPUT, module, Mute8::OUTPUT4_OUTPUT)); + addOutput(createPort<Port24>(output5OutputPosition, PortWidget::OUTPUT, module, Mute8::OUTPUT5_OUTPUT)); + addOutput(createPort<Port24>(output6OutputPosition, PortWidget::OUTPUT, module, Mute8::OUTPUT6_OUTPUT)); + addOutput(createPort<Port24>(output7OutputPosition, PortWidget::OUTPUT, module, Mute8::OUTPUT7_OUTPUT)); + addOutput(createPort<Port24>(output8OutputPosition, PortWidget::OUTPUT, module, Mute8::OUTPUT8_OUTPUT)); + + addChild(createLight<SmallLight<GreenLight>>(mute1LightPosition, module, Mute8::MUTE1_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(mute2LightPosition, module, Mute8::MUTE2_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(mute3LightPosition, module, Mute8::MUTE3_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(mute4LightPosition, module, Mute8::MUTE4_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(mute5LightPosition, module, Mute8::MUTE5_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(mute6LightPosition, module, Mute8::MUTE6_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(mute7LightPosition, module, Mute8::MUTE7_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(mute8LightPosition, module, Mute8::MUTE8_LIGHT)); } }; diff --git a/src/Noise.cpp b/src/Noise.cpp @@ -41,8 +41,8 @@ struct NoiseWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto absInputPosition = Vec(10.5, 253.0); @@ -55,14 +55,14 @@ struct NoiseWidget : ModuleWidget { auto absOutputPosition = Vec(10.5, 291.0); // end generated by svg_widgets.rb - addInput(Port::create<Port24>(absInputPosition, Port::INPUT, module, Noise::ABS_INPUT)); + addInput(createPort<Port24>(absInputPosition, PortWidget::INPUT, module, Noise::ABS_INPUT)); - addOutput(Port::create<Port24>(blueOutputPosition, Port::OUTPUT, module, Noise::BLUE_OUTPUT)); - addOutput(Port::create<Port24>(whiteOutputPosition, Port::OUTPUT, module, Noise::WHITE_OUTPUT)); - addOutput(Port::create<Port24>(pinkOutputPosition, Port::OUTPUT, module, Noise::PINK_OUTPUT)); - addOutput(Port::create<Port24>(redOutputPosition, Port::OUTPUT, module, Noise::RED_OUTPUT)); - addOutput(Port::create<Port24>(gaussOutputPosition, Port::OUTPUT, module, Noise::GAUSS_OUTPUT)); - addOutput(Port::create<Port24>(absOutputPosition, Port::OUTPUT, module, Noise::ABS_OUTPUT)); + addOutput(createPort<Port24>(blueOutputPosition, PortWidget::OUTPUT, module, Noise::BLUE_OUTPUT)); + addOutput(createPort<Port24>(whiteOutputPosition, PortWidget::OUTPUT, module, Noise::WHITE_OUTPUT)); + addOutput(createPort<Port24>(pinkOutputPosition, PortWidget::OUTPUT, module, Noise::PINK_OUTPUT)); + addOutput(createPort<Port24>(redOutputPosition, PortWidget::OUTPUT, module, Noise::RED_OUTPUT)); + addOutput(createPort<Port24>(gaussOutputPosition, PortWidget::OUTPUT, module, Noise::GAUSS_OUTPUT)); + addOutput(createPort<Port24>(absOutputPosition, PortWidget::OUTPUT, module, Noise::ABS_OUTPUT)); } }; diff --git a/src/Nsgt.cpp b/src/Nsgt.cpp @@ -81,8 +81,8 @@ struct NsgtWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto thresholdParamPosition = Vec(26.0, 52.0); @@ -98,17 +98,17 @@ struct NsgtWidget : ModuleWidget { auto rightOutputPosition = Vec(50.0, 320.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob38>(thresholdParamPosition, module, Nsgt::THRESHOLD_PARAM, 0.0, 1.0, 0.8)); - addParam(ParamWidget::create<Knob38>(ratioParamPosition, module, Nsgt::RATIO_PARAM, 0.0, 1.0, 0.552)); - addParam(ParamWidget::create<SliderSwitch2State14>(kneeParamPosition, module, Nsgt::KNEE_PARAM, 0.95, 1.0, 1.0)); + addParam(createParam<Knob38>(thresholdParamPosition, module, Nsgt::THRESHOLD_PARAM, 0.0, 1.0, 0.8)); + addParam(createParam<Knob38>(ratioParamPosition, module, Nsgt::RATIO_PARAM, 0.0, 1.0, 0.552)); + addParam(createParam<SliderSwitch2State14>(kneeParamPosition, module, Nsgt::KNEE_PARAM, 0.95, 1.0, 1.0)); - addInput(Port::create<Port24>(leftInputPosition, Port::INPUT, module, Nsgt::LEFT_INPUT)); - addInput(Port::create<Port24>(rightInputPosition, Port::INPUT, module, Nsgt::RIGHT_INPUT)); - addInput(Port::create<Port24>(thresholdInputPosition, Port::INPUT, module, Nsgt::THRESHOLD_INPUT)); - addInput(Port::create<Port24>(ratioInputPosition, Port::INPUT, module, Nsgt::RATIO_INPUT)); + addInput(createPort<Port24>(leftInputPosition, PortWidget::INPUT, module, Nsgt::LEFT_INPUT)); + addInput(createPort<Port24>(rightInputPosition, PortWidget::INPUT, module, Nsgt::RIGHT_INPUT)); + addInput(createPort<Port24>(thresholdInputPosition, PortWidget::INPUT, module, Nsgt::THRESHOLD_INPUT)); + addInput(createPort<Port24>(ratioInputPosition, PortWidget::INPUT, module, Nsgt::RATIO_INPUT)); - addOutput(Port::create<Port24>(leftOutputPosition, Port::OUTPUT, module, Nsgt::LEFT_OUTPUT)); - addOutput(Port::create<Port24>(rightOutputPosition, Port::OUTPUT, module, Nsgt::RIGHT_OUTPUT)); + addOutput(createPort<Port24>(leftOutputPosition, PortWidget::OUTPUT, module, Nsgt::LEFT_OUTPUT)); + addOutput(createPort<Port24>(rightOutputPosition, PortWidget::OUTPUT, module, Nsgt::RIGHT_OUTPUT)); } }; diff --git a/src/Offset.cpp b/src/Offset.cpp @@ -37,8 +37,8 @@ struct OffsetWidget : DisableOutputLimitModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto offsetParamPosition = Vec(8.0, 40.0); @@ -51,14 +51,14 @@ struct OffsetWidget : DisableOutputLimitModuleWidget { auto outOutputPosition = Vec(10.5, 281.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob29>(offsetParamPosition, module, Offset::OFFSET_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob29>(scaleParamPosition, module, Offset::SCALE_PARAM, -1.0, 1.0, 0.316)); + addParam(createParam<Knob29>(offsetParamPosition, module, Offset::OFFSET_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob29>(scaleParamPosition, module, Offset::SCALE_PARAM, -1.0, 1.0, 0.316)); - addInput(Port::create<Port24>(offsetInputPosition, Port::INPUT, module, Offset::OFFSET_INPUT)); - addInput(Port::create<Port24>(scaleInputPosition, Port::INPUT, module, Offset::SCALE_INPUT)); - addInput(Port::create<Port24>(inInputPosition, Port::INPUT, module, Offset::IN_INPUT)); + addInput(createPort<Port24>(offsetInputPosition, PortWidget::INPUT, module, Offset::OFFSET_INPUT)); + addInput(createPort<Port24>(scaleInputPosition, PortWidget::INPUT, module, Offset::SCALE_INPUT)); + addInput(createPort<Port24>(inInputPosition, PortWidget::INPUT, module, Offset::IN_INPUT)); - addOutput(Port::create<Port24>(outOutputPosition, Port::OUTPUT, module, Offset::OUT_OUTPUT)); + addOutput(createPort<Port24>(outOutputPosition, PortWidget::OUTPUT, module, Offset::OUT_OUTPUT)); } }; diff --git a/src/OneEight.cpp b/src/OneEight.cpp @@ -85,8 +85,8 @@ struct OneEightWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto stepsParamPosition = Vec(15.5, 131.5); @@ -118,39 +118,39 @@ struct OneEightWidget : ModuleWidget { // end generated by svg_widgets.rb { - auto w = ParamWidget::create<Knob16>(stepsParamPosition, module, OneEight::STEPS_PARAM, 1.0, 8.0, 8.0); + auto w = createParam<Knob16>(stepsParamPosition, module, OneEight::STEPS_PARAM, 1.0, 8.0, 8.0); dynamic_cast<Knob*>(w)->snap = true; addParam(w); } - addParam(ParamWidget::create<SliderSwitch2State14>(directionParamPosition, module, OneEight::DIRECTION_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<SliderSwitch2State14>(directionParamPosition, module, OneEight::DIRECTION_PARAM, 0.0, 1.0, 1.0)); { - auto w = ParamWidget::create<Knob29>(selectParamPosition, module, OneEight::SELECT_PARAM, 0.0, 7.0, 0.0); + auto w = createParam<Knob29>(selectParamPosition, module, OneEight::SELECT_PARAM, 0.0, 7.0, 0.0); dynamic_cast<Knob*>(w)->snap = true; addParam(w); } - addInput(Port::create<Port24>(clockInputPosition, Port::INPUT, module, OneEight::CLOCK_INPUT)); - addInput(Port::create<Port24>(resetInputPosition, Port::INPUT, module, OneEight::RESET_INPUT)); - addInput(Port::create<Port24>(selectInputPosition, Port::INPUT, module, OneEight::SELECT_INPUT)); - addInput(Port::create<Port24>(inInputPosition, Port::INPUT, module, OneEight::IN_INPUT)); - - addOutput(Port::create<Port24>(out1OutputPosition, Port::OUTPUT, module, OneEight::OUT1_OUTPUT)); - addOutput(Port::create<Port24>(out2OutputPosition, Port::OUTPUT, module, OneEight::OUT2_OUTPUT)); - addOutput(Port::create<Port24>(out3OutputPosition, Port::OUTPUT, module, OneEight::OUT3_OUTPUT)); - addOutput(Port::create<Port24>(out4OutputPosition, Port::OUTPUT, module, OneEight::OUT4_OUTPUT)); - addOutput(Port::create<Port24>(out5OutputPosition, Port::OUTPUT, module, OneEight::OUT5_OUTPUT)); - addOutput(Port::create<Port24>(out6OutputPosition, Port::OUTPUT, module, OneEight::OUT6_OUTPUT)); - addOutput(Port::create<Port24>(out7OutputPosition, Port::OUTPUT, module, OneEight::OUT7_OUTPUT)); - addOutput(Port::create<Port24>(out8OutputPosition, Port::OUTPUT, module, OneEight::OUT8_OUTPUT)); - - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(out1LightPosition, module, OneEight::OUT1_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(out2LightPosition, module, OneEight::OUT2_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(out3LightPosition, module, OneEight::OUT3_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(out4LightPosition, module, OneEight::OUT4_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(out5LightPosition, module, OneEight::OUT5_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(out6LightPosition, module, OneEight::OUT6_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(out7LightPosition, module, OneEight::OUT7_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(out8LightPosition, module, OneEight::OUT8_LIGHT)); + addInput(createPort<Port24>(clockInputPosition, PortWidget::INPUT, module, OneEight::CLOCK_INPUT)); + addInput(createPort<Port24>(resetInputPosition, PortWidget::INPUT, module, OneEight::RESET_INPUT)); + addInput(createPort<Port24>(selectInputPosition, PortWidget::INPUT, module, OneEight::SELECT_INPUT)); + addInput(createPort<Port24>(inInputPosition, PortWidget::INPUT, module, OneEight::IN_INPUT)); + + addOutput(createPort<Port24>(out1OutputPosition, PortWidget::OUTPUT, module, OneEight::OUT1_OUTPUT)); + addOutput(createPort<Port24>(out2OutputPosition, PortWidget::OUTPUT, module, OneEight::OUT2_OUTPUT)); + addOutput(createPort<Port24>(out3OutputPosition, PortWidget::OUTPUT, module, OneEight::OUT3_OUTPUT)); + addOutput(createPort<Port24>(out4OutputPosition, PortWidget::OUTPUT, module, OneEight::OUT4_OUTPUT)); + addOutput(createPort<Port24>(out5OutputPosition, PortWidget::OUTPUT, module, OneEight::OUT5_OUTPUT)); + addOutput(createPort<Port24>(out6OutputPosition, PortWidget::OUTPUT, module, OneEight::OUT6_OUTPUT)); + addOutput(createPort<Port24>(out7OutputPosition, PortWidget::OUTPUT, module, OneEight::OUT7_OUTPUT)); + addOutput(createPort<Port24>(out8OutputPosition, PortWidget::OUTPUT, module, OneEight::OUT8_OUTPUT)); + + addChild(createLight<SmallLight<GreenLight>>(out1LightPosition, module, OneEight::OUT1_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(out2LightPosition, module, OneEight::OUT2_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(out3LightPosition, module, OneEight::OUT3_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(out4LightPosition, module, OneEight::OUT4_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(out5LightPosition, module, OneEight::OUT5_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(out6LightPosition, module, OneEight::OUT6_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(out7LightPosition, module, OneEight::OUT7_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(out8LightPosition, module, OneEight::OUT8_LIGHT)); } void appendContextMenu(Menu* menu) override { diff --git a/src/Pan.cpp b/src/Pan.cpp @@ -45,8 +45,8 @@ struct PanWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto pan1ParamPosition = Vec(9.5, 24.5); @@ -61,16 +61,16 @@ struct PanWidget : ModuleWidget { auto rOutputPosition = Vec(10.5, 303.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob26>(pan1ParamPosition, module, Pan::PAN1_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob26>(pan2ParamPosition, module, Pan::PAN2_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob26>(pan1ParamPosition, module, Pan::PAN1_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob26>(pan2ParamPosition, module, Pan::PAN2_PARAM, -1.0, 1.0, 0.0)); - addInput(Port::create<Port24>(cv1InputPosition, Port::INPUT, module, Pan::CV1_INPUT)); - addInput(Port::create<Port24>(in1InputPosition, Port::INPUT, module, Pan::IN1_INPUT)); - addInput(Port::create<Port24>(cv2InputPosition, Port::INPUT, module, Pan::CV2_INPUT)); - addInput(Port::create<Port24>(in2InputPosition, Port::INPUT, module, Pan::IN2_INPUT)); + addInput(createPort<Port24>(cv1InputPosition, PortWidget::INPUT, module, Pan::CV1_INPUT)); + addInput(createPort<Port24>(in1InputPosition, PortWidget::INPUT, module, Pan::IN1_INPUT)); + addInput(createPort<Port24>(cv2InputPosition, PortWidget::INPUT, module, Pan::CV2_INPUT)); + addInput(createPort<Port24>(in2InputPosition, PortWidget::INPUT, module, Pan::IN2_INPUT)); - addOutput(Port::create<Port24>(lOutputPosition, Port::OUTPUT, module, Pan::L_OUTPUT)); - addOutput(Port::create<Port24>(rOutputPosition, Port::OUTPUT, module, Pan::R_OUTPUT)); + addOutput(createPort<Port24>(lOutputPosition, PortWidget::OUTPUT, module, Pan::L_OUTPUT)); + addOutput(createPort<Port24>(rOutputPosition, PortWidget::OUTPUT, module, Pan::R_OUTPUT)); } }; diff --git a/src/Pressor.cpp b/src/Pressor.cpp @@ -184,10 +184,10 @@ struct PressorWidget : ModuleWidget { addChild(display); } - addChild(Widget::create<ScrewSilver>(Vec(15, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 0))); - addChild(Widget::create<ScrewSilver>(Vec(15, 365))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 365))); + addChild(createWidget<ScrewSilver>(Vec(15, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0))); + addChild(createWidget<ScrewSilver>(Vec(15, 365))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 365))); // generated by svg_widgets.rb auto thresholdParamPosition = Vec(36.0, 53.0); @@ -216,30 +216,30 @@ struct PressorWidget : ModuleWidget { auto rightOutputPosition = Vec(186.0, 318.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob38>(thresholdParamPosition, module, Pressor::THRESHOLD_PARAM, 0.0, 1.0, 0.8)); - addParam(ParamWidget::create<Knob38>(ratioParamPosition, module, Pressor::RATIO_PARAM, 0.0, 1.0, 0.552)); - addParam(ParamWidget::create<Knob26>(attackParamPosition, module, Pressor::ATTACK_PARAM, 0.0, 1.0, 0.316)); - addParam(ParamWidget::create<Knob26>(releaseParamPosition, module, Pressor::RELEASE_PARAM, 0.0, 1.0, 0.316)); - addParam(ParamWidget::create<Knob26>(outputGainParamPosition, module, Pressor::OUTPUT_GAIN_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob26>(inputGainParamPosition, module, Pressor::INPUT_GAIN_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob26>(detectorMixParamPosition, module, Pressor::DETECTOR_MIX_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<SliderSwitch2State14>(modeParamPosition, module, Pressor::MODE_PARAM, 0.0, 1.0, 1.0)); - addParam(ParamWidget::create<SliderSwitch2State14>(dectectorModeParamPosition, module, Pressor::DECTECTOR_MODE_PARAM, 0.0, 1.0, 1.0)); - addParam(ParamWidget::create<SliderSwitch2State14>(kneeParamPosition, module, Pressor::KNEE_PARAM, 0.95, 1.0, 1.0)); - - addInput(Port::create<Port24>(leftInputPosition, Port::INPUT, module, Pressor::LEFT_INPUT)); - addInput(Port::create<Port24>(sidechainInputPosition, Port::INPUT, module, Pressor::SIDECHAIN_INPUT)); - addInput(Port::create<Port24>(thresholdInputPosition, Port::INPUT, module, Pressor::THRESHOLD_INPUT)); - addInput(Port::create<Port24>(ratioInputPosition, Port::INPUT, module, Pressor::RATIO_INPUT)); - addInput(Port::create<Port24>(rightInputPosition, Port::INPUT, module, Pressor::RIGHT_INPUT)); - addInput(Port::create<Port24>(attackInputPosition, Port::INPUT, module, Pressor::ATTACK_INPUT)); - addInput(Port::create<Port24>(releaseInputPosition, Port::INPUT, module, Pressor::RELEASE_INPUT)); - addInput(Port::create<Port24>(inputGainInputPosition, Port::INPUT, module, Pressor::INPUT_GAIN_INPUT)); - addInput(Port::create<Port24>(outputGainInputPosition, Port::INPUT, module, Pressor::OUTPUT_GAIN_INPUT)); - - addOutput(Port::create<Port24>(envelopeOutputPosition, Port::OUTPUT, module, Pressor::ENVELOPE_OUTPUT)); - addOutput(Port::create<Port24>(leftOutputPosition, Port::OUTPUT, module, Pressor::LEFT_OUTPUT)); - addOutput(Port::create<Port24>(rightOutputPosition, Port::OUTPUT, module, Pressor::RIGHT_OUTPUT)); + addParam(createParam<Knob38>(thresholdParamPosition, module, Pressor::THRESHOLD_PARAM, 0.0, 1.0, 0.8)); + addParam(createParam<Knob38>(ratioParamPosition, module, Pressor::RATIO_PARAM, 0.0, 1.0, 0.552)); + addParam(createParam<Knob26>(attackParamPosition, module, Pressor::ATTACK_PARAM, 0.0, 1.0, 0.316)); + addParam(createParam<Knob26>(releaseParamPosition, module, Pressor::RELEASE_PARAM, 0.0, 1.0, 0.316)); + addParam(createParam<Knob26>(outputGainParamPosition, module, Pressor::OUTPUT_GAIN_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<Knob26>(inputGainParamPosition, module, Pressor::INPUT_GAIN_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob26>(detectorMixParamPosition, module, Pressor::DETECTOR_MIX_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<SliderSwitch2State14>(modeParamPosition, module, Pressor::MODE_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<SliderSwitch2State14>(dectectorModeParamPosition, module, Pressor::DECTECTOR_MODE_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<SliderSwitch2State14>(kneeParamPosition, module, Pressor::KNEE_PARAM, 0.95, 1.0, 1.0)); + + addInput(createPort<Port24>(leftInputPosition, PortWidget::INPUT, module, Pressor::LEFT_INPUT)); + addInput(createPort<Port24>(sidechainInputPosition, PortWidget::INPUT, module, Pressor::SIDECHAIN_INPUT)); + addInput(createPort<Port24>(thresholdInputPosition, PortWidget::INPUT, module, Pressor::THRESHOLD_INPUT)); + addInput(createPort<Port24>(ratioInputPosition, PortWidget::INPUT, module, Pressor::RATIO_INPUT)); + addInput(createPort<Port24>(rightInputPosition, PortWidget::INPUT, module, Pressor::RIGHT_INPUT)); + addInput(createPort<Port24>(attackInputPosition, PortWidget::INPUT, module, Pressor::ATTACK_INPUT)); + addInput(createPort<Port24>(releaseInputPosition, PortWidget::INPUT, module, Pressor::RELEASE_INPUT)); + addInput(createPort<Port24>(inputGainInputPosition, PortWidget::INPUT, module, Pressor::INPUT_GAIN_INPUT)); + addInput(createPort<Port24>(outputGainInputPosition, PortWidget::INPUT, module, Pressor::OUTPUT_GAIN_INPUT)); + + addOutput(createPort<Port24>(envelopeOutputPosition, PortWidget::OUTPUT, module, Pressor::ENVELOPE_OUTPUT)); + addOutput(createPort<Port24>(leftOutputPosition, PortWidget::OUTPUT, module, Pressor::LEFT_OUTPUT)); + addOutput(createPort<Port24>(rightOutputPosition, PortWidget::OUTPUT, module, Pressor::RIGHT_OUTPUT)); } }; diff --git a/src/Reftone.cpp b/src/Reftone.cpp @@ -200,8 +200,8 @@ struct ReftoneWidget : ModuleWidget { addChild(display); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto pitchParamPosition = Vec(9.5, 89.5); @@ -213,19 +213,19 @@ struct ReftoneWidget : ModuleWidget { // end generated by svg_widgets.rb { - auto w = ParamWidget::create<Knob26>(pitchParamPosition, module, Reftone::PITCH_PARAM, 0.0, 11.0, 9.0); + auto w = createParam<Knob26>(pitchParamPosition, module, Reftone::PITCH_PARAM, 0.0, 11.0, 9.0); dynamic_cast<Knob*>(w)->snap = true; addParam(w); } { - auto w = ParamWidget::create<Knob26>(octaveParamPosition, module, Reftone::OCTAVE_PARAM, 1.0, 8.0, 4.0); + auto w = createParam<Knob26>(octaveParamPosition, module, Reftone::OCTAVE_PARAM, 1.0, 8.0, 4.0); dynamic_cast<Knob*>(w)->snap = true; addParam(w); } - addParam(ParamWidget::create<Knob26>(fineParamPosition, module, Reftone::FINE_PARAM, -0.99, 0.99, 0.0)); + addParam(createParam<Knob26>(fineParamPosition, module, Reftone::FINE_PARAM, -0.99, 0.99, 0.0)); - addOutput(Port::create<Port24>(cvOutputPosition, Port::OUTPUT, module, Reftone::CV_OUTPUT)); - addOutput(Port::create<Port24>(outOutputPosition, Port::OUTPUT, module, Reftone::OUT_OUTPUT)); + addOutput(createPort<Port24>(cvOutputPosition, PortWidget::OUTPUT, module, Reftone::CV_OUTPUT)); + addOutput(createPort<Port24>(outOutputPosition, PortWidget::OUTPUT, module, Reftone::OUT_OUTPUT)); } }; diff --git a/src/SampleHold.cpp b/src/SampleHold.cpp @@ -51,8 +51,8 @@ struct SampleHoldWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto trigger1ParamPosition = Vec(13.5, 27.0); @@ -72,21 +72,21 @@ struct SampleHoldWidget : ModuleWidget { auto track2LightPosition = Vec(7.0, 287.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Button18>(trigger1ParamPosition, module, SampleHold::TRIGGER1_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<Button18>(trigger2ParamPosition, module, SampleHold::TRIGGER2_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<StatefulButton9>(track1ParamPosition, module, SampleHold::TRACK1_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<StatefulButton9>(track2ParamPosition, module, SampleHold::TRACK2_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<Button18>(trigger1ParamPosition, module, SampleHold::TRIGGER1_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<Button18>(trigger2ParamPosition, module, SampleHold::TRIGGER2_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<StatefulButton9>(track1ParamPosition, module, SampleHold::TRACK1_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<StatefulButton9>(track2ParamPosition, module, SampleHold::TRACK2_PARAM, 0.0, 1.0, 0.0)); - addInput(Port::create<Port24>(trigger1InputPosition, Port::INPUT, module, SampleHold::TRIGGER1_INPUT)); - addInput(Port::create<Port24>(in1InputPosition, Port::INPUT, module, SampleHold::IN1_INPUT)); - addInput(Port::create<Port24>(trigger2InputPosition, Port::INPUT, module, SampleHold::TRIGGER2_INPUT)); - addInput(Port::create<Port24>(in2InputPosition, Port::INPUT, module, SampleHold::IN2_INPUT)); + addInput(createPort<Port24>(trigger1InputPosition, PortWidget::INPUT, module, SampleHold::TRIGGER1_INPUT)); + addInput(createPort<Port24>(in1InputPosition, PortWidget::INPUT, module, SampleHold::IN1_INPUT)); + addInput(createPort<Port24>(trigger2InputPosition, PortWidget::INPUT, module, SampleHold::TRIGGER2_INPUT)); + addInput(createPort<Port24>(in2InputPosition, PortWidget::INPUT, module, SampleHold::IN2_INPUT)); - addOutput(Port::create<Port24>(out1OutputPosition, Port::OUTPUT, module, SampleHold::OUT1_OUTPUT)); - addOutput(Port::create<Port24>(out2OutputPosition, Port::OUTPUT, module, SampleHold::OUT2_OUTPUT)); + addOutput(createPort<Port24>(out1OutputPosition, PortWidget::OUTPUT, module, SampleHold::OUT1_OUTPUT)); + addOutput(createPort<Port24>(out2OutputPosition, PortWidget::OUTPUT, module, SampleHold::OUT2_OUTPUT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(track1LightPosition, module, SampleHold::TRACK1_LIGHT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(track2LightPosition, module, SampleHold::TRACK2_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(track1LightPosition, module, SampleHold::TRACK1_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(track2LightPosition, module, SampleHold::TRACK2_LIGHT)); } }; diff --git a/src/Shaper.cpp b/src/Shaper.cpp @@ -14,10 +14,10 @@ struct ShaperWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 0))); - addChild(Widget::create<ScrewSilver>(Vec(0, 365))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 0))); + addChild(createWidget<ScrewSilver>(Vec(0, 365))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto attackParamPosition = Vec(29.08, 33.08); @@ -44,30 +44,30 @@ struct ShaperWidget : ModuleWidget { auto offLightPosition = Vec(12.0, 237.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob38>(attackParamPosition, module, Shaper::ATTACK_PARAM, 0.0, 1.0, 0.12)); - addParam(ParamWidget::create<Knob38>(onParamPosition, module, Shaper::ON_PARAM, 0.0, 1.0, 0.32)); - addParam(ParamWidget::create<Knob38>(decayParamPosition, module, Shaper::DECAY_PARAM, 0.0, 1.0, 0.32)); - addParam(ParamWidget::create<Knob38>(offParamPosition, module, Shaper::OFF_PARAM, 0.0, 1.0, 0.07)); - addParam(ParamWidget::create<Knob38>(envParamPosition, module, Shaper::ENV_PARAM, 0.0, 1.0, 1.0)); - addParam(ParamWidget::create<Knob38>(signalParamPosition, module, Shaper::SIGNAL_PARAM, 0.0, 1.0, 0.1)); + addParam(createParam<Knob38>(attackParamPosition, module, Shaper::ATTACK_PARAM, 0.0, 1.0, 0.12)); + addParam(createParam<Knob38>(onParamPosition, module, Shaper::ON_PARAM, 0.0, 1.0, 0.32)); + addParam(createParam<Knob38>(decayParamPosition, module, Shaper::DECAY_PARAM, 0.0, 1.0, 0.32)); + addParam(createParam<Knob38>(offParamPosition, module, Shaper::OFF_PARAM, 0.0, 1.0, 0.07)); + addParam(createParam<Knob38>(envParamPosition, module, Shaper::ENV_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<Knob38>(signalParamPosition, module, Shaper::SIGNAL_PARAM, 0.0, 1.0, 0.1)); - addParam(ParamWidget::create<Button18>(triggerParamPosition, module, Shaper::TRIGGER_PARAM, 0.0, 1.0, 0.0)); - addInput(Port::create<Port24>(triggerInputPosition, Port::INPUT, module, Shaper::TRIGGER_INPUT)); + addParam(createParam<Button18>(triggerParamPosition, module, Shaper::TRIGGER_PARAM, 0.0, 1.0, 0.0)); + addInput(createPort<Port24>(triggerInputPosition, PortWidget::INPUT, module, Shaper::TRIGGER_INPUT)); - addParam(ParamWidget::create<SliderSwitch2State14>(speedParamPosition, module, Shaper::SPEED_PARAM, 0.0, 1.0, 1.0)); - addParam(ParamWidget::create<SliderSwitch2State14>(loopParamPosition, module, Shaper::LOOP_PARAM, 0.0, 1.0, 1.0)); - addOutput(Port::create<Port24>(triggerOutputPosition, Port::OUTPUT, module, Shaper::TRIGGER_OUTPUT)); + addParam(createParam<SliderSwitch2State14>(speedParamPosition, module, Shaper::SPEED_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<SliderSwitch2State14>(loopParamPosition, module, Shaper::LOOP_PARAM, 0.0, 1.0, 1.0)); + addOutput(createPort<Port24>(triggerOutputPosition, PortWidget::OUTPUT, module, Shaper::TRIGGER_OUTPUT)); - addOutput(Port::create<Port24>(envOutputPosition, Port::OUTPUT, module, Shaper::ENV_OUTPUT)); - addOutput(Port::create<Port24>(invOutputPosition, Port::OUTPUT, module, Shaper::INV_OUTPUT)); + addOutput(createPort<Port24>(envOutputPosition, PortWidget::OUTPUT, module, Shaper::ENV_OUTPUT)); + addOutput(createPort<Port24>(invOutputPosition, PortWidget::OUTPUT, module, Shaper::INV_OUTPUT)); - addInput(Port::create<Port24>(signalInputPosition, Port::INPUT, module, Shaper::SIGNAL_INPUT)); - addOutput(Port::create<Port24>(signalOutputPosition, Port::OUTPUT, module, Shaper::SIGNAL_OUTPUT)); + addInput(createPort<Port24>(signalInputPosition, PortWidget::INPUT, module, Shaper::SIGNAL_INPUT)); + addOutput(createPort<Port24>(signalOutputPosition, PortWidget::OUTPUT, module, Shaper::SIGNAL_OUTPUT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(attackLightPosition, module, Shaper::ATTACK_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(onLightPosition, module, Shaper::ON_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(decayLightPosition, module, Shaper::DECAY_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(offLightPosition, module, Shaper::OFF_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(attackLightPosition, module, Shaper::ATTACK_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(onLightPosition, module, Shaper::ON_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(decayLightPosition, module, Shaper::DECAY_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(offLightPosition, module, Shaper::OFF_LIGHT)); } void appendContextMenu(Menu* menu) override { diff --git a/src/ShaperPlus.cpp b/src/ShaperPlus.cpp @@ -14,10 +14,10 @@ struct ShaperPlusWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(15, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 0))); - addChild(Widget::create<ScrewSilver>(Vec(15, 365))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 365))); + addChild(createWidget<ScrewSilver>(Vec(15, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0))); + addChild(createWidget<ScrewSilver>(Vec(15, 365))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 365))); // generated by svg_widgets.rb auto attackParamPosition = Vec(29.08, 33.08); @@ -54,42 +54,42 @@ struct ShaperPlusWidget : ModuleWidget { auto offLightPosition = Vec(12.0, 237.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob38>(attackParamPosition, module, ShaperPlus::ATTACK_PARAM, 0.0, 1.0, 0.12)); - addParam(ParamWidget::create<Knob38>(onParamPosition, module, ShaperPlus::ON_PARAM, 0.0, 1.0, 0.32)); - addParam(ParamWidget::create<Knob38>(decayParamPosition, module, ShaperPlus::DECAY_PARAM, 0.0, 1.0, 0.32)); - addParam(ParamWidget::create<Knob38>(offParamPosition, module, ShaperPlus::OFF_PARAM, 0.0, 1.0, 0.07)); - addParam(ParamWidget::create<Knob38>(envParamPosition, module, ShaperPlus::ENV_PARAM, 0.0, 1.0, 1.0)); - addParam(ParamWidget::create<Knob38>(signalParamPosition, module, ShaperPlus::SIGNAL_PARAM, 0.0, 1.0, 0.1)); - - addParam(ParamWidget::create<Button18>(triggerParamPosition, module, ShaperPlus::TRIGGER_PARAM, 0.0, 1.0, 0.0)); - addInput(Port::create<Port24>(triggerInputPosition, Port::INPUT, module, ShaperPlus::TRIGGER_INPUT)); - - addParam(ParamWidget::create<SliderSwitch2State14>(speedParamPosition, module, ShaperPlus::SPEED_PARAM, 0.0, 1.0, 1.0)); - addParam(ParamWidget::create<SliderSwitch2State14>(loopParamPosition, module, ShaperPlus::LOOP_PARAM, 0.0, 1.0, 1.0)); - addOutput(Port::create<Port24>(triggerOutputPosition, Port::OUTPUT, module, ShaperPlus::TRIGGER_OUTPUT)); - - addOutput(Port::create<Port24>(envOutputPosition, Port::OUTPUT, module, ShaperPlus::ENV_OUTPUT)); - addOutput(Port::create<Port24>(invOutputPosition, Port::OUTPUT, module, ShaperPlus::INV_OUTPUT)); - - addInput(Port::create<Port24>(signalInputPosition, Port::INPUT, module, ShaperPlus::SIGNAL_INPUT)); - addOutput(Port::create<Port24>(signalOutputPosition, Port::OUTPUT, module, ShaperPlus::SIGNAL_OUTPUT)); - - addInput(Port::create<Port24>(attackInputPosition, Port::INPUT, module, ShaperPlus::ATTACK_INPUT)); - addInput(Port::create<Port24>(onInputPosition, Port::INPUT, module, ShaperPlus::ON_INPUT)); - addInput(Port::create<Port24>(decayInputPosition, Port::INPUT, module, ShaperPlus::DECAY_INPUT)); - addInput(Port::create<Port24>(offInputPosition, Port::INPUT, module, ShaperPlus::OFF_INPUT)); - addInput(Port::create<Port24>(envInputPosition, Port::INPUT, module, ShaperPlus::ENV_INPUT)); - addInput(Port::create<Port24>(signalcvInputPosition, Port::INPUT, module, ShaperPlus::SIGNALCV_INPUT)); - - addOutput(Port::create<Port24>(attackOutputPosition, Port::OUTPUT, module, ShaperPlus::ATTACK_OUTPUT)); - addOutput(Port::create<Port24>(onOutputPosition, Port::OUTPUT, module, ShaperPlus::ON_OUTPUT)); - addOutput(Port::create<Port24>(decayOutputPosition, Port::OUTPUT, module, ShaperPlus::DECAY_OUTPUT)); - addOutput(Port::create<Port24>(offOutputPosition, Port::OUTPUT, module, ShaperPlus::OFF_OUTPUT)); - - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(attackLightPosition, module, ShaperPlus::ATTACK_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(onLightPosition, module, ShaperPlus::ON_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(decayLightPosition, module, ShaperPlus::DECAY_LIGHT)); - addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(offLightPosition, module, ShaperPlus::OFF_LIGHT)); + addParam(createParam<Knob38>(attackParamPosition, module, ShaperPlus::ATTACK_PARAM, 0.0, 1.0, 0.12)); + addParam(createParam<Knob38>(onParamPosition, module, ShaperPlus::ON_PARAM, 0.0, 1.0, 0.32)); + addParam(createParam<Knob38>(decayParamPosition, module, ShaperPlus::DECAY_PARAM, 0.0, 1.0, 0.32)); + addParam(createParam<Knob38>(offParamPosition, module, ShaperPlus::OFF_PARAM, 0.0, 1.0, 0.07)); + addParam(createParam<Knob38>(envParamPosition, module, ShaperPlus::ENV_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<Knob38>(signalParamPosition, module, ShaperPlus::SIGNAL_PARAM, 0.0, 1.0, 0.1)); + + addParam(createParam<Button18>(triggerParamPosition, module, ShaperPlus::TRIGGER_PARAM, 0.0, 1.0, 0.0)); + addInput(createPort<Port24>(triggerInputPosition, PortWidget::INPUT, module, ShaperPlus::TRIGGER_INPUT)); + + addParam(createParam<SliderSwitch2State14>(speedParamPosition, module, ShaperPlus::SPEED_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<SliderSwitch2State14>(loopParamPosition, module, ShaperPlus::LOOP_PARAM, 0.0, 1.0, 1.0)); + addOutput(createPort<Port24>(triggerOutputPosition, PortWidget::OUTPUT, module, ShaperPlus::TRIGGER_OUTPUT)); + + addOutput(createPort<Port24>(envOutputPosition, PortWidget::OUTPUT, module, ShaperPlus::ENV_OUTPUT)); + addOutput(createPort<Port24>(invOutputPosition, PortWidget::OUTPUT, module, ShaperPlus::INV_OUTPUT)); + + addInput(createPort<Port24>(signalInputPosition, PortWidget::INPUT, module, ShaperPlus::SIGNAL_INPUT)); + addOutput(createPort<Port24>(signalOutputPosition, PortWidget::OUTPUT, module, ShaperPlus::SIGNAL_OUTPUT)); + + addInput(createPort<Port24>(attackInputPosition, PortWidget::INPUT, module, ShaperPlus::ATTACK_INPUT)); + addInput(createPort<Port24>(onInputPosition, PortWidget::INPUT, module, ShaperPlus::ON_INPUT)); + addInput(createPort<Port24>(decayInputPosition, PortWidget::INPUT, module, ShaperPlus::DECAY_INPUT)); + addInput(createPort<Port24>(offInputPosition, PortWidget::INPUT, module, ShaperPlus::OFF_INPUT)); + addInput(createPort<Port24>(envInputPosition, PortWidget::INPUT, module, ShaperPlus::ENV_INPUT)); + addInput(createPort<Port24>(signalcvInputPosition, PortWidget::INPUT, module, ShaperPlus::SIGNALCV_INPUT)); + + addOutput(createPort<Port24>(attackOutputPosition, PortWidget::OUTPUT, module, ShaperPlus::ATTACK_OUTPUT)); + addOutput(createPort<Port24>(onOutputPosition, PortWidget::OUTPUT, module, ShaperPlus::ON_OUTPUT)); + addOutput(createPort<Port24>(decayOutputPosition, PortWidget::OUTPUT, module, ShaperPlus::DECAY_OUTPUT)); + addOutput(createPort<Port24>(offOutputPosition, PortWidget::OUTPUT, module, ShaperPlus::OFF_OUTPUT)); + + addChild(createLight<TinyLight<GreenLight>>(attackLightPosition, module, ShaperPlus::ATTACK_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(onLightPosition, module, ShaperPlus::ON_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(decayLightPosition, module, ShaperPlus::DECAY_LIGHT)); + addChild(createLight<TinyLight<GreenLight>>(offLightPosition, module, ShaperPlus::OFF_LIGHT)); } void appendContextMenu(Menu* menu) override { diff --git a/src/Slew.cpp b/src/Slew.cpp @@ -73,8 +73,8 @@ struct SlewWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto riseParamPosition = Vec(9.5, 34.0); @@ -89,16 +89,16 @@ struct SlewWidget : ModuleWidget { auto outOutputPosition = Vec(10.5, 301.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob26>(riseParamPosition, module, Slew::RISE_PARAM, 0.0, 1.0, 0.316)); - addParam(ParamWidget::create<Knob16>(riseShapeParamPosition, module, Slew::RISE_SHAPE_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob26>(fallParamPosition, module, Slew::FALL_PARAM, 0.0, 1.0, 0.316)); - addParam(ParamWidget::create<Knob16>(fallShapeParamPosition, module, Slew::FALL_SHAPE_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob26>(riseParamPosition, module, Slew::RISE_PARAM, 0.0, 1.0, 0.316)); + addParam(createParam<Knob16>(riseShapeParamPosition, module, Slew::RISE_SHAPE_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob26>(fallParamPosition, module, Slew::FALL_PARAM, 0.0, 1.0, 0.316)); + addParam(createParam<Knob16>(fallShapeParamPosition, module, Slew::FALL_SHAPE_PARAM, -1.0, 1.0, 0.0)); - addInput(Port::create<Port24>(riseInputPosition, Port::INPUT, module, Slew::RISE_INPUT)); - addInput(Port::create<Port24>(fallInputPosition, Port::INPUT, module, Slew::FALL_INPUT)); - addInput(Port::create<Port24>(inInputPosition, Port::INPUT, module, Slew::IN_INPUT)); + addInput(createPort<Port24>(riseInputPosition, PortWidget::INPUT, module, Slew::RISE_INPUT)); + addInput(createPort<Port24>(fallInputPosition, PortWidget::INPUT, module, Slew::FALL_INPUT)); + addInput(createPort<Port24>(inInputPosition, PortWidget::INPUT, module, Slew::IN_INPUT)); - addOutput(Port::create<Port24>(outOutputPosition, Port::OUTPUT, module, Slew::OUT_OUTPUT)); + addOutput(createPort<Port24>(outOutputPosition, PortWidget::OUTPUT, module, Slew::OUT_OUTPUT)); } }; diff --git a/src/Stack.cpp b/src/Stack.cpp @@ -52,8 +52,8 @@ struct StackWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto semisParamPosition = Vec(9.5, 32.5); @@ -71,28 +71,28 @@ struct StackWidget : ModuleWidget { // end generated by svg_widgets.rb { - auto w = ParamWidget::create<Knob26>(semisParamPosition, module, Stack::SEMIS_PARAM, 0.0, 11.0, 0.0); + auto w = createParam<Knob26>(semisParamPosition, module, Stack::SEMIS_PARAM, 0.0, 11.0, 0.0); dynamic_cast<Knob*>(w)->snap = true; addParam(w); } { - auto w = ParamWidget::create<Knob16>(octaveParamPosition, module, Stack::OCTAVE_PARAM, -3.0, 3.0, 0.0); + auto w = createParam<Knob16>(octaveParamPosition, module, Stack::OCTAVE_PARAM, -3.0, 3.0, 0.0); auto k = dynamic_cast<SVGKnob*>(w); k->snap = true; k->minAngle = -0.5 * M_PI; k->maxAngle = 0.5 * M_PI; addParam(w); } - addParam(ParamWidget::create<Knob16>(fineParamPosition, module, Stack::FINE_PARAM, -0.99, 0.99, 0.0)); - addParam(ParamWidget::create<StatefulButton9>(quantizeParamPosition, module, Stack::QUANTIZE_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<Knob16>(fineParamPosition, module, Stack::FINE_PARAM, -0.99, 0.99, 0.0)); + addParam(createParam<StatefulButton9>(quantizeParamPosition, module, Stack::QUANTIZE_PARAM, 0.0, 1.0, 1.0)); - addInput(Port::create<Port24>(cvInputPosition, Port::INPUT, module, Stack::CV_INPUT)); - addInput(Port::create<Port24>(inInputPosition, Port::INPUT, module, Stack::IN_INPUT)); + addInput(createPort<Port24>(cvInputPosition, PortWidget::INPUT, module, Stack::CV_INPUT)); + addInput(createPort<Port24>(inInputPosition, PortWidget::INPUT, module, Stack::IN_INPUT)); - addOutput(Port::create<Port24>(thruOutputPosition, Port::OUTPUT, module, Stack::THRU_OUTPUT)); - addOutput(Port::create<Port24>(outOutputPosition, Port::OUTPUT, module, Stack::OUT_OUTPUT)); + addOutput(createPort<Port24>(thruOutputPosition, PortWidget::OUTPUT, module, Stack::THRU_OUTPUT)); + addOutput(createPort<Port24>(outOutputPosition, PortWidget::OUTPUT, module, Stack::OUT_OUTPUT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(quantizeLightPosition, module, Stack::QUANTIZE_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(quantizeLightPosition, module, Stack::QUANTIZE_LIGHT)); } }; diff --git a/src/Sums.cpp b/src/Sums.cpp @@ -45,8 +45,8 @@ struct SumsWidget : DisableOutputLimitModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto aInputPosition = Vec(10.5, 23.0); @@ -60,15 +60,15 @@ struct SumsWidget : DisableOutputLimitModuleWidget { auto negateOutputPosition = Vec(10.5, 295.0); // end generated by svg_widgets.rb - addInput(Port::create<Port24>(aInputPosition, Port::INPUT, module, Sums::A_INPUT)); - addInput(Port::create<Port24>(bInputPosition, Port::INPUT, module, Sums::B_INPUT)); - addInput(Port::create<Port24>(negateInputPosition, Port::INPUT, module, Sums::NEGATE_INPUT)); + addInput(createPort<Port24>(aInputPosition, PortWidget::INPUT, module, Sums::A_INPUT)); + addInput(createPort<Port24>(bInputPosition, PortWidget::INPUT, module, Sums::B_INPUT)); + addInput(createPort<Port24>(negateInputPosition, PortWidget::INPUT, module, Sums::NEGATE_INPUT)); - addOutput(Port::create<Port24>(sumOutputPosition, Port::OUTPUT, module, Sums::SUM_OUTPUT)); - addOutput(Port::create<Port24>(differenceOutputPosition, Port::OUTPUT, module, Sums::DIFFERENCE_OUTPUT)); - addOutput(Port::create<Port24>(maxOutputPosition, Port::OUTPUT, module, Sums::MAX_OUTPUT)); - addOutput(Port::create<Port24>(minOutputPosition, Port::OUTPUT, module, Sums::MIN_OUTPUT)); - addOutput(Port::create<Port24>(negateOutputPosition, Port::OUTPUT, module, Sums::NEGATE_OUTPUT)); + addOutput(createPort<Port24>(sumOutputPosition, PortWidget::OUTPUT, module, Sums::SUM_OUTPUT)); + addOutput(createPort<Port24>(differenceOutputPosition, PortWidget::OUTPUT, module, Sums::DIFFERENCE_OUTPUT)); + addOutput(createPort<Port24>(maxOutputPosition, PortWidget::OUTPUT, module, Sums::MAX_OUTPUT)); + addOutput(createPort<Port24>(minOutputPosition, PortWidget::OUTPUT, module, Sums::MIN_OUTPUT)); + addOutput(createPort<Port24>(negateOutputPosition, PortWidget::OUTPUT, module, Sums::NEGATE_OUTPUT)); } }; diff --git a/src/Switch.cpp b/src/Switch.cpp @@ -42,8 +42,8 @@ struct SwitchWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto gateParamPosition = Vec(13.5, 22.0); @@ -61,19 +61,19 @@ struct SwitchWidget : ModuleWidget { auto latchLightPosition = Vec(4.0, 84.5); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Button18>(gateParamPosition, module, bogaudio::Switch::GATE_PARAM, 0.0, 10.0, 0.0)); - addParam(ParamWidget::create<StatefulButton9>(latchParamPosition, module, bogaudio::Switch::LATCH_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<Button18>(gateParamPosition, module, bogaudio::Switch::GATE_PARAM, 0.0, 10.0, 0.0)); + addParam(createParam<StatefulButton9>(latchParamPosition, module, bogaudio::Switch::LATCH_PARAM, 0.0, 1.0, 0.0)); - addInput(Port::create<Port24>(gateInputPosition, Port::INPUT, module, bogaudio::Switch::GATE_INPUT)); - addInput(Port::create<Port24>(high1InputPosition, Port::INPUT, module, bogaudio::Switch::HIGH1_INPUT)); - addInput(Port::create<Port24>(low1InputPosition, Port::INPUT, module, bogaudio::Switch::LOW1_INPUT)); - addInput(Port::create<Port24>(high2InputPosition, Port::INPUT, module, bogaudio::Switch::HIGH2_INPUT)); - addInput(Port::create<Port24>(low2InputPosition, Port::INPUT, module, bogaudio::Switch::LOW2_INPUT)); + addInput(createPort<Port24>(gateInputPosition, PortWidget::INPUT, module, bogaudio::Switch::GATE_INPUT)); + addInput(createPort<Port24>(high1InputPosition, PortWidget::INPUT, module, bogaudio::Switch::HIGH1_INPUT)); + addInput(createPort<Port24>(low1InputPosition, PortWidget::INPUT, module, bogaudio::Switch::LOW1_INPUT)); + addInput(createPort<Port24>(high2InputPosition, PortWidget::INPUT, module, bogaudio::Switch::HIGH2_INPUT)); + addInput(createPort<Port24>(low2InputPosition, PortWidget::INPUT, module, bogaudio::Switch::LOW2_INPUT)); - addOutput(Port::create<Port24>(out1OutputPosition, Port::OUTPUT, module, bogaudio::Switch::OUT1_OUTPUT)); - addOutput(Port::create<Port24>(out2OutputPosition, Port::OUTPUT, module, bogaudio::Switch::OUT2_OUTPUT)); + addOutput(createPort<Port24>(out1OutputPosition, PortWidget::OUTPUT, module, bogaudio::Switch::OUT1_OUTPUT)); + addOutput(createPort<Port24>(out2OutputPosition, PortWidget::OUTPUT, module, bogaudio::Switch::OUT2_OUTPUT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(latchLightPosition, module, bogaudio::Switch::LATCH_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(latchLightPosition, module, bogaudio::Switch::LATCH_LIGHT)); } }; diff --git a/src/Test.cpp b/src/Test.cpp @@ -493,8 +493,8 @@ struct TestWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto param1ParamPosition = Vec(9.5, 13.5); @@ -510,17 +510,17 @@ struct TestWidget : ModuleWidget { auto out2OutputPosition = Vec(20.5, 316.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob26>(param1ParamPosition, module, Test::PARAM1_PARAM, 0.0, 1.0, 0.5)); - addParam(ParamWidget::create<Knob26>(param2ParamPosition, module, Test::PARAM2_PARAM, 0.0, 1.0, 0.5)); - addParam(ParamWidget::create<Knob26>(param3ParamPosition, module, Test::PARAM3_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam<Knob26>(param1ParamPosition, module, Test::PARAM1_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam<Knob26>(param2ParamPosition, module, Test::PARAM2_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam<Knob26>(param3ParamPosition, module, Test::PARAM3_PARAM, 0.0, 1.0, 0.5)); - addInput(Port::create<Port24>(cv1InputPosition, Port::INPUT, module, Test::CV1_INPUT)); - addInput(Port::create<Port24>(cv2InputPosition, Port::INPUT, module, Test::CV2_INPUT)); - addInput(Port::create<Port24>(cv3InputPosition, Port::INPUT, module, Test::CV3_INPUT)); - addInput(Port::create<Port24>(inInputPosition, Port::INPUT, module, Test::IN_INPUT)); + addInput(createPort<Port24>(cv1InputPosition, PortWidget::INPUT, module, Test::CV1_INPUT)); + addInput(createPort<Port24>(cv2InputPosition, PortWidget::INPUT, module, Test::CV2_INPUT)); + addInput(createPort<Port24>(cv3InputPosition, PortWidget::INPUT, module, Test::CV3_INPUT)); + addInput(createPort<Port24>(inInputPosition, PortWidget::INPUT, module, Test::IN_INPUT)); - addOutput(Port::create<Port24>(outOutputPosition, Port::OUTPUT, module, Test::OUT_OUTPUT)); - addOutput(Port::create<Port24>(out2OutputPosition, Port::OUTPUT, module, Test::OUT2_OUTPUT)); + addOutput(createPort<Port24>(outOutputPosition, PortWidget::OUTPUT, module, Test::OUT_OUTPUT)); + addOutput(createPort<Port24>(out2OutputPosition, PortWidget::OUTPUT, module, Test::OUT2_OUTPUT)); } }; diff --git a/src/Test2.cpp b/src/Test2.cpp @@ -115,8 +115,8 @@ struct Test2Widget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto param1aParamPosition = Vec(9.5, 38.5); @@ -137,22 +137,22 @@ struct Test2Widget : ModuleWidget { auto outOutputPosition = Vec(55.5, 323.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob26>(param1aParamPosition, module, Test2::PARAM1A_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob26>(param2aParamPosition, module, Test2::PARAM2A_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob26>(param3aParamPosition, module, Test2::PARAM3A_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob26>(param1bParamPosition, module, Test2::PARAM1B_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob26>(param2bParamPosition, module, Test2::PARAM2B_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob26>(param3bParamPosition, module, Test2::PARAM3B_PARAM, 0.0, 1.0, 0.0)); - - addInput(Port::create<Port24>(cv1aInputPosition, Port::INPUT, module, Test2::CV1A_INPUT)); - addInput(Port::create<Port24>(cv2aInputPosition, Port::INPUT, module, Test2::CV2A_INPUT)); - addInput(Port::create<Port24>(cv3aInputPosition, Port::INPUT, module, Test2::CV3A_INPUT)); - addInput(Port::create<Port24>(cv1bInputPosition, Port::INPUT, module, Test2::CV1B_INPUT)); - addInput(Port::create<Port24>(cv2bInputPosition, Port::INPUT, module, Test2::CV2B_INPUT)); - addInput(Port::create<Port24>(cv3bInputPosition, Port::INPUT, module, Test2::CV3B_INPUT)); - addInput(Port::create<Port24>(inInputPosition, Port::INPUT, module, Test2::IN_INPUT)); - - addOutput(Port::create<Port24>(outOutputPosition, Port::OUTPUT, module, Test2::OUT_OUTPUT)); + addParam(createParam<Knob26>(param1aParamPosition, module, Test2::PARAM1A_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<Knob26>(param2aParamPosition, module, Test2::PARAM2A_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<Knob26>(param3aParamPosition, module, Test2::PARAM3A_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<Knob26>(param1bParamPosition, module, Test2::PARAM1B_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<Knob26>(param2bParamPosition, module, Test2::PARAM2B_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<Knob26>(param3bParamPosition, module, Test2::PARAM3B_PARAM, 0.0, 1.0, 0.0)); + + addInput(createPort<Port24>(cv1aInputPosition, PortWidget::INPUT, module, Test2::CV1A_INPUT)); + addInput(createPort<Port24>(cv2aInputPosition, PortWidget::INPUT, module, Test2::CV2A_INPUT)); + addInput(createPort<Port24>(cv3aInputPosition, PortWidget::INPUT, module, Test2::CV3A_INPUT)); + addInput(createPort<Port24>(cv1bInputPosition, PortWidget::INPUT, module, Test2::CV1B_INPUT)); + addInput(createPort<Port24>(cv2bInputPosition, PortWidget::INPUT, module, Test2::CV2B_INPUT)); + addInput(createPort<Port24>(cv3bInputPosition, PortWidget::INPUT, module, Test2::CV3B_INPUT)); + addInput(createPort<Port24>(inInputPosition, PortWidget::INPUT, module, Test2::IN_INPUT)); + + addOutput(createPort<Port24>(outOutputPosition, PortWidget::OUTPUT, module, Test2::OUT_OUTPUT)); } }; diff --git a/src/UMix.cpp b/src/UMix.cpp @@ -114,8 +114,8 @@ struct UMixWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto levelParamPosition = Vec(14.5, 320.5); @@ -132,18 +132,18 @@ struct UMixWidget : ModuleWidget { auto outOutputPosition = Vec(10.5, 263.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob16>(levelParamPosition, module, UMix::LEVEL_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<Knob16>(levelParamPosition, module, UMix::LEVEL_PARAM, 0.0, 1.0, 1.0)); - addInput(Port::create<Port24>(in1InputPosition, Port::INPUT, module, UMix::IN1_INPUT)); - addInput(Port::create<Port24>(in2InputPosition, Port::INPUT, module, UMix::IN2_INPUT)); - addInput(Port::create<Port24>(in3InputPosition, Port::INPUT, module, UMix::IN3_INPUT)); - addInput(Port::create<Port24>(in4InputPosition, Port::INPUT, module, UMix::IN4_INPUT)); - addInput(Port::create<Port24>(in5InputPosition, Port::INPUT, module, UMix::IN5_INPUT)); - addInput(Port::create<Port24>(in6InputPosition, Port::INPUT, module, UMix::IN6_INPUT)); - addInput(Port::create<Port24>(in7InputPosition, Port::INPUT, module, UMix::IN7_INPUT)); - addInput(Port::create<Port24>(in8InputPosition, Port::INPUT, module, UMix::IN8_INPUT)); + addInput(createPort<Port24>(in1InputPosition, PortWidget::INPUT, module, UMix::IN1_INPUT)); + addInput(createPort<Port24>(in2InputPosition, PortWidget::INPUT, module, UMix::IN2_INPUT)); + addInput(createPort<Port24>(in3InputPosition, PortWidget::INPUT, module, UMix::IN3_INPUT)); + addInput(createPort<Port24>(in4InputPosition, PortWidget::INPUT, module, UMix::IN4_INPUT)); + addInput(createPort<Port24>(in5InputPosition, PortWidget::INPUT, module, UMix::IN5_INPUT)); + addInput(createPort<Port24>(in6InputPosition, PortWidget::INPUT, module, UMix::IN6_INPUT)); + addInput(createPort<Port24>(in7InputPosition, PortWidget::INPUT, module, UMix::IN7_INPUT)); + addInput(createPort<Port24>(in8InputPosition, PortWidget::INPUT, module, UMix::IN8_INPUT)); - addOutput(Port::create<Port24>(outOutputPosition, Port::OUTPUT, module, UMix::OUT_OUTPUT)); + addOutput(createPort<Port24>(outOutputPosition, PortWidget::OUTPUT, module, UMix::OUT_OUTPUT)); } void appendContextMenu(Menu* menu) override { diff --git a/src/VCA.cpp b/src/VCA.cpp @@ -46,8 +46,8 @@ struct VCAWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto level1ParamPosition = Vec(9.5, 22.5); @@ -65,19 +65,19 @@ struct VCAWidget : ModuleWidget { auto linearLightPosition = Vec(6.5, 334.5); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob26>(level1ParamPosition, module, VCA::LEVEL1_PARAM, 0.0, 1.0, 0.8)); - addParam(ParamWidget::create<Knob26>(level2ParamPosition, module, VCA::LEVEL2_PARAM, 0.0, 1.0, 0.8)); - addParam(ParamWidget::create<StatefulButton9>(linearParamPosition, module, VCA::LINEAR_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<Knob26>(level1ParamPosition, module, VCA::LEVEL1_PARAM, 0.0, 1.0, 0.8)); + addParam(createParam<Knob26>(level2ParamPosition, module, VCA::LEVEL2_PARAM, 0.0, 1.0, 0.8)); + addParam(createParam<StatefulButton9>(linearParamPosition, module, VCA::LINEAR_PARAM, 0.0, 1.0, 0.0)); - addInput(Port::create<Port24>(cv1InputPosition, Port::INPUT, module, VCA::CV1_INPUT)); - addInput(Port::create<Port24>(in1InputPosition, Port::INPUT, module, VCA::IN1_INPUT)); - addInput(Port::create<Port24>(cv2InputPosition, Port::INPUT, module, VCA::CV2_INPUT)); - addInput(Port::create<Port24>(in2InputPosition, Port::INPUT, module, VCA::IN2_INPUT)); + addInput(createPort<Port24>(cv1InputPosition, PortWidget::INPUT, module, VCA::CV1_INPUT)); + addInput(createPort<Port24>(in1InputPosition, PortWidget::INPUT, module, VCA::IN1_INPUT)); + addInput(createPort<Port24>(cv2InputPosition, PortWidget::INPUT, module, VCA::CV2_INPUT)); + addInput(createPort<Port24>(in2InputPosition, PortWidget::INPUT, module, VCA::IN2_INPUT)); - addOutput(Port::create<Port24>(out1OutputPosition, Port::OUTPUT, module, VCA::OUT1_OUTPUT)); - addOutput(Port::create<Port24>(out2OutputPosition, Port::OUTPUT, module, VCA::OUT2_OUTPUT)); + addOutput(createPort<Port24>(out1OutputPosition, PortWidget::OUTPUT, module, VCA::OUT1_OUTPUT)); + addOutput(createPort<Port24>(out2OutputPosition, PortWidget::OUTPUT, module, VCA::OUT2_OUTPUT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(linearLightPosition, module, VCA::LINEAR_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(linearLightPosition, module, VCA::LINEAR_LIGHT)); } }; diff --git a/src/VCAmp.cpp b/src/VCAmp.cpp @@ -38,8 +38,8 @@ struct VCAmpWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto levelParamPosition = Vec(13.5, 18.0); @@ -50,7 +50,7 @@ struct VCAmpWidget : ModuleWidget { auto outOutputPosition = Vec(10.5, 286.0); // end generated by svg_widgets.rb - auto slider = ParamWidget::create<VUSlider>( + auto slider = createParam<VUSlider>( levelParamPosition, module, VCAmp::LEVEL_PARAM, @@ -61,10 +61,10 @@ struct VCAmpWidget : ModuleWidget { dynamic_cast<VUSlider*>(slider)->setVULevel(&(module->_rmsLevel)); addParam(slider); - addInput(Port::create<Port24>(cvInputPosition, Port::INPUT, module, VCAmp::CV_INPUT)); - addInput(Port::create<Port24>(inInputPosition, Port::INPUT, module, VCAmp::IN_INPUT)); + addInput(createPort<Port24>(cvInputPosition, PortWidget::INPUT, module, VCAmp::CV_INPUT)); + addInput(createPort<Port24>(inInputPosition, PortWidget::INPUT, module, VCAmp::IN_INPUT)); - addOutput(Port::create<Port24>(outOutputPosition, Port::OUTPUT, module, VCAmp::OUT_OUTPUT)); + addOutput(createPort<Port24>(outOutputPosition, PortWidget::OUTPUT, module, VCAmp::OUT_OUTPUT)); } }; diff --git a/src/VCM.cpp b/src/VCM.cpp @@ -51,10 +51,10 @@ struct VCMWidget : DisableOutputLimitModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 0))); - addChild(Widget::create<ScrewSilver>(Vec(0, 365))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 0))); + addChild(createWidget<ScrewSilver>(Vec(0, 365))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto level1ParamPosition = Vec(89.5, 35.5); @@ -79,26 +79,26 @@ struct VCMWidget : DisableOutputLimitModuleWidget { auto linearLightPosition = Vec(46.0, 344.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob38>(level1ParamPosition, module, VCM::LEVEL1_PARAM, 0.0, 1.0, 0.8)); - addParam(ParamWidget::create<Knob38>(level2ParamPosition, module, VCM::LEVEL2_PARAM, 0.0, 1.0, 0.8)); - addParam(ParamWidget::create<Knob38>(level3ParamPosition, module, VCM::LEVEL3_PARAM, 0.0, 1.0, 0.8)); - addParam(ParamWidget::create<Knob38>(level4ParamPosition, module, VCM::LEVEL4_PARAM, 0.0, 1.0, 0.8)); - addParam(ParamWidget::create<Knob38>(mixParamPosition, module, VCM::MIX_PARAM, 0.0, 1.0, 0.8)); - addParam(ParamWidget::create<StatefulButton9>(linearParamPosition, module, VCM::LINEAR_PARAM, 0.0, 1.0, 0.0)); - - addInput(Port::create<Port24>(in1InputPosition, Port::INPUT, module, VCM::IN1_INPUT)); - addInput(Port::create<Port24>(cv1InputPosition, Port::INPUT, module, VCM::CV1_INPUT)); - addInput(Port::create<Port24>(in2InputPosition, Port::INPUT, module, VCM::IN2_INPUT)); - addInput(Port::create<Port24>(cv2InputPosition, Port::INPUT, module, VCM::CV2_INPUT)); - addInput(Port::create<Port24>(in3InputPosition, Port::INPUT, module, VCM::IN3_INPUT)); - addInput(Port::create<Port24>(cv3InputPosition, Port::INPUT, module, VCM::CV3_INPUT)); - addInput(Port::create<Port24>(in4InputPosition, Port::INPUT, module, VCM::IN4_INPUT)); - addInput(Port::create<Port24>(cv4InputPosition, Port::INPUT, module, VCM::CV4_INPUT)); - addInput(Port::create<Port24>(mixCvInputPosition, Port::INPUT, module, VCM::MIX_CV_INPUT)); - - addOutput(Port::create<Port24>(mixOutputPosition, Port::OUTPUT, module, VCM::MIX_OUTPUT)); - - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(linearLightPosition, module, VCM::LINEAR_LIGHT)); + addParam(createParam<Knob38>(level1ParamPosition, module, VCM::LEVEL1_PARAM, 0.0, 1.0, 0.8)); + addParam(createParam<Knob38>(level2ParamPosition, module, VCM::LEVEL2_PARAM, 0.0, 1.0, 0.8)); + addParam(createParam<Knob38>(level3ParamPosition, module, VCM::LEVEL3_PARAM, 0.0, 1.0, 0.8)); + addParam(createParam<Knob38>(level4ParamPosition, module, VCM::LEVEL4_PARAM, 0.0, 1.0, 0.8)); + addParam(createParam<Knob38>(mixParamPosition, module, VCM::MIX_PARAM, 0.0, 1.0, 0.8)); + addParam(createParam<StatefulButton9>(linearParamPosition, module, VCM::LINEAR_PARAM, 0.0, 1.0, 0.0)); + + addInput(createPort<Port24>(in1InputPosition, PortWidget::INPUT, module, VCM::IN1_INPUT)); + addInput(createPort<Port24>(cv1InputPosition, PortWidget::INPUT, module, VCM::CV1_INPUT)); + addInput(createPort<Port24>(in2InputPosition, PortWidget::INPUT, module, VCM::IN2_INPUT)); + addInput(createPort<Port24>(cv2InputPosition, PortWidget::INPUT, module, VCM::CV2_INPUT)); + addInput(createPort<Port24>(in3InputPosition, PortWidget::INPUT, module, VCM::IN3_INPUT)); + addInput(createPort<Port24>(cv3InputPosition, PortWidget::INPUT, module, VCM::CV3_INPUT)); + addInput(createPort<Port24>(in4InputPosition, PortWidget::INPUT, module, VCM::IN4_INPUT)); + addInput(createPort<Port24>(cv4InputPosition, PortWidget::INPUT, module, VCM::CV4_INPUT)); + addInput(createPort<Port24>(mixCvInputPosition, PortWidget::INPUT, module, VCM::MIX_CV_INPUT)); + + addOutput(createPort<Port24>(mixOutputPosition, PortWidget::OUTPUT, module, VCM::MIX_OUTPUT)); + + addChild(createLight<SmallLight<GreenLight>>(linearLightPosition, module, VCM::LINEAR_LIGHT)); } }; diff --git a/src/VCO.cpp b/src/VCO.cpp @@ -165,10 +165,10 @@ struct VCOWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 0))); - addChild(Widget::create<ScrewSilver>(Vec(0, 365))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 0))); + addChild(createWidget<ScrewSilver>(Vec(0, 365))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto frequencyParamPosition = Vec(41.0, 45.0); @@ -191,24 +191,24 @@ struct VCOWidget : ModuleWidget { auto slowLightPosition = Vec(82.0, 158.5); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob68>(frequencyParamPosition, module, VCO::FREQUENCY_PARAM, -3.0, 6.0, 0.0)); - addParam(ParamWidget::create<Knob16>(fineParamPosition, module, VCO::FINE_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<StatefulButton9>(slowParamPosition, module, VCO::SLOW_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob26>(pwParamPosition, module, VCO::PW_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob26>(fmParamPosition, module, VCO::FM_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<SliderSwitch2State14>(fmTypeParamPosition, module, VCO::FM_TYPE_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<Knob68>(frequencyParamPosition, module, VCO::FREQUENCY_PARAM, -3.0, 6.0, 0.0)); + addParam(createParam<Knob16>(fineParamPosition, module, VCO::FINE_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<StatefulButton9>(slowParamPosition, module, VCO::SLOW_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<Knob26>(pwParamPosition, module, VCO::PW_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob26>(fmParamPosition, module, VCO::FM_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<SliderSwitch2State14>(fmTypeParamPosition, module, VCO::FM_TYPE_PARAM, 0.0, 1.0, 1.0)); - addInput(Port::create<Port24>(pitchInputPosition, Port::INPUT, module, VCO::PITCH_INPUT)); - addInput(Port::create<Port24>(syncInputPosition, Port::INPUT, module, VCO::SYNC_INPUT)); - addInput(Port::create<Port24>(pwInputPosition, Port::INPUT, module, VCO::PW_INPUT)); - addInput(Port::create<Port24>(fmInputPosition, Port::INPUT, module, VCO::FM_INPUT)); + addInput(createPort<Port24>(pitchInputPosition, PortWidget::INPUT, module, VCO::PITCH_INPUT)); + addInput(createPort<Port24>(syncInputPosition, PortWidget::INPUT, module, VCO::SYNC_INPUT)); + addInput(createPort<Port24>(pwInputPosition, PortWidget::INPUT, module, VCO::PW_INPUT)); + addInput(createPort<Port24>(fmInputPosition, PortWidget::INPUT, module, VCO::FM_INPUT)); - addOutput(Port::create<Port24>(squareOutputPosition, Port::OUTPUT, module, VCO::SQUARE_OUTPUT)); - addOutput(Port::create<Port24>(sawOutputPosition, Port::OUTPUT, module, VCO::SAW_OUTPUT)); - addOutput(Port::create<Port24>(triangleOutputPosition, Port::OUTPUT, module, VCO::TRIANGLE_OUTPUT)); - addOutput(Port::create<Port24>(sineOutputPosition, Port::OUTPUT, module, VCO::SINE_OUTPUT)); + addOutput(createPort<Port24>(squareOutputPosition, PortWidget::OUTPUT, module, VCO::SQUARE_OUTPUT)); + addOutput(createPort<Port24>(sawOutputPosition, PortWidget::OUTPUT, module, VCO::SAW_OUTPUT)); + addOutput(createPort<Port24>(triangleOutputPosition, PortWidget::OUTPUT, module, VCO::TRIANGLE_OUTPUT)); + addOutput(createPort<Port24>(sineOutputPosition, PortWidget::OUTPUT, module, VCO::SINE_OUTPUT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(slowLightPosition, module, VCO::SLOW_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(slowLightPosition, module, VCO::SLOW_LIGHT)); } }; diff --git a/src/VU.cpp b/src/VU.cpp @@ -104,8 +104,8 @@ struct VUWidget : ModuleWidget { addChild(display); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto lInputPosition = Vec(10.5, 203.0); @@ -115,11 +115,11 @@ struct VUWidget : ModuleWidget { auto rOutputPosition = Vec(10.5, 311.0); // end generated by svg_widgets.rb - addInput(Port::create<Port24>(lInputPosition, Port::INPUT, module, VU::L_INPUT)); - addInput(Port::create<Port24>(rInputPosition, Port::INPUT, module, VU::R_INPUT)); + addInput(createPort<Port24>(lInputPosition, PortWidget::INPUT, module, VU::L_INPUT)); + addInput(createPort<Port24>(rInputPosition, PortWidget::INPUT, module, VU::R_INPUT)); - addOutput(Port::create<Port24>(lOutputPosition, Port::OUTPUT, module, VU::L_OUTPUT)); - addOutput(Port::create<Port24>(rOutputPosition, Port::OUTPUT, module, VU::R_OUTPUT)); + addOutput(createPort<Port24>(lOutputPosition, PortWidget::OUTPUT, module, VU::L_OUTPUT)); + addOutput(createPort<Port24>(rOutputPosition, PortWidget::OUTPUT, module, VU::R_OUTPUT)); } }; diff --git a/src/Walk.cpp b/src/Walk.cpp @@ -58,8 +58,8 @@ struct WalkWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto rateParamPosition = Vec(8.0, 36.0); @@ -74,16 +74,16 @@ struct WalkWidget : ModuleWidget { auto outOutputPosition = Vec(10.5, 303.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob29>(rateParamPosition, module, Walk::RATE_PARAM, 0.0, 1.0, 0.1)); - addParam(ParamWidget::create<Knob16>(offsetParamPosition, module, Walk::OFFSET_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob16>(scaleParamPosition, module, Walk::SCALE_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<Knob29>(rateParamPosition, module, Walk::RATE_PARAM, 0.0, 1.0, 0.1)); + addParam(createParam<Knob16>(offsetParamPosition, module, Walk::OFFSET_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob16>(scaleParamPosition, module, Walk::SCALE_PARAM, 0.0, 1.0, 1.0)); - addInput(Port::create<Port24>(rateInputPosition, Port::INPUT, module, Walk::RATE_INPUT)); - addInput(Port::create<Port24>(offsetInputPosition, Port::INPUT, module, Walk::OFFSET_INPUT)); - addInput(Port::create<Port24>(scaleInputPosition, Port::INPUT, module, Walk::SCALE_INPUT)); - addInput(Port::create<Port24>(jumpInputPosition, Port::INPUT, module, Walk::JUMP_INPUT)); + addInput(createPort<Port24>(rateInputPosition, PortWidget::INPUT, module, Walk::RATE_INPUT)); + addInput(createPort<Port24>(offsetInputPosition, PortWidget::INPUT, module, Walk::OFFSET_INPUT)); + addInput(createPort<Port24>(scaleInputPosition, PortWidget::INPUT, module, Walk::SCALE_INPUT)); + addInput(createPort<Port24>(jumpInputPosition, PortWidget::INPUT, module, Walk::JUMP_INPUT)); - addOutput(Port::create<Port24>(outOutputPosition, Port::OUTPUT, module, Walk::OUT_OUTPUT)); + addOutput(createPort<Port24>(outOutputPosition, PortWidget::OUTPUT, module, Walk::OUT_OUTPUT)); } }; diff --git a/src/Walk2.cpp b/src/Walk2.cpp @@ -487,10 +487,10 @@ struct Walk2Widget : ModuleWidget { addChild(display); } - addChild(Widget::create<ScrewSilver>(Vec(15, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 0))); - addChild(Widget::create<ScrewSilver>(Vec(15, 365))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 365))); + addChild(createWidget<ScrewSilver>(Vec(15, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0))); + addChild(createWidget<ScrewSilver>(Vec(15, 365))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 365))); // generated by svg_widgets.rb auto rateXParamPosition = Vec(28.0, 240.0); @@ -513,24 +513,24 @@ struct Walk2Widget : ModuleWidget { auto distanceOutputPosition = Vec(109.0, 303.0); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob29>(rateXParamPosition, module, Walk2::RATE_X_PARAM, 0.0, 1.0, 0.1)); - addParam(ParamWidget::create<Knob29>(rateYParamPosition, module, Walk2::RATE_Y_PARAM, 0.0, 1.0, 0.1)); - addParam(ParamWidget::create<Knob16>(offsetXParamPosition, module, Walk2::OFFSET_X_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob16>(offsetYParamPosition, module, Walk2::OFFSET_Y_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob16>(scaleXParamPosition, module, Walk2::SCALE_X_PARAM, 0.0, 1.0, 1.0)); - addParam(ParamWidget::create<Knob16>(scaleYParamPosition, module, Walk2::SCALE_Y_PARAM, 0.0, 1.0, 1.0)); - - addInput(Port::create<Port24>(offsetXInputPosition, Port::INPUT, module, Walk2::OFFSET_X_INPUT)); - addInput(Port::create<Port24>(scaleXInputPosition, Port::INPUT, module, Walk2::SCALE_X_INPUT)); - addInput(Port::create<Port24>(rateXInputPosition, Port::INPUT, module, Walk2::RATE_X_INPUT)); - addInput(Port::create<Port24>(offsetYInputPosition, Port::INPUT, module, Walk2::OFFSET_Y_INPUT)); - addInput(Port::create<Port24>(scaleYInputPosition, Port::INPUT, module, Walk2::SCALE_Y_INPUT)); - addInput(Port::create<Port24>(rateYInputPosition, Port::INPUT, module, Walk2::RATE_Y_INPUT)); - addInput(Port::create<Port24>(jumpInputPosition, Port::INPUT, module, Walk2::JUMP_INPUT)); - - addOutput(Port::create<Port24>(outXOutputPosition, Port::OUTPUT, module, Walk2::OUT_X_OUTPUT)); - addOutput(Port::create<Port24>(outYOutputPosition, Port::OUTPUT, module, Walk2::OUT_Y_OUTPUT)); - addOutput(Port::create<Port24>(distanceOutputPosition, Port::OUTPUT, module, Walk2::DISTANCE_OUTPUT)); + addParam(createParam<Knob29>(rateXParamPosition, module, Walk2::RATE_X_PARAM, 0.0, 1.0, 0.1)); + addParam(createParam<Knob29>(rateYParamPosition, module, Walk2::RATE_Y_PARAM, 0.0, 1.0, 0.1)); + addParam(createParam<Knob16>(offsetXParamPosition, module, Walk2::OFFSET_X_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob16>(offsetYParamPosition, module, Walk2::OFFSET_Y_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob16>(scaleXParamPosition, module, Walk2::SCALE_X_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<Knob16>(scaleYParamPosition, module, Walk2::SCALE_Y_PARAM, 0.0, 1.0, 1.0)); + + addInput(createPort<Port24>(offsetXInputPosition, PortWidget::INPUT, module, Walk2::OFFSET_X_INPUT)); + addInput(createPort<Port24>(scaleXInputPosition, PortWidget::INPUT, module, Walk2::SCALE_X_INPUT)); + addInput(createPort<Port24>(rateXInputPosition, PortWidget::INPUT, module, Walk2::RATE_X_INPUT)); + addInput(createPort<Port24>(offsetYInputPosition, PortWidget::INPUT, module, Walk2::OFFSET_Y_INPUT)); + addInput(createPort<Port24>(scaleYInputPosition, PortWidget::INPUT, module, Walk2::SCALE_Y_INPUT)); + addInput(createPort<Port24>(rateYInputPosition, PortWidget::INPUT, module, Walk2::RATE_Y_INPUT)); + addInput(createPort<Port24>(jumpInputPosition, PortWidget::INPUT, module, Walk2::JUMP_INPUT)); + + addOutput(createPort<Port24>(outXOutputPosition, PortWidget::OUTPUT, module, Walk2::OUT_X_OUTPUT)); + addOutput(createPort<Port24>(outYOutputPosition, PortWidget::OUTPUT, module, Walk2::OUT_Y_OUTPUT)); + addOutput(createPort<Port24>(distanceOutputPosition, PortWidget::OUTPUT, module, Walk2::DISTANCE_OUTPUT)); } void appendContextMenu(Menu* menu) override { diff --git a/src/XCO.cpp b/src/XCO.cpp @@ -267,10 +267,10 @@ struct XCOWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(15, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 0))); - addChild(Widget::create<ScrewSilver>(Vec(15, 365))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 365))); + addChild(createWidget<ScrewSilver>(Vec(15, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0))); + addChild(createWidget<ScrewSilver>(Vec(15, 365))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 365))); // generated by svg_widgets.rb auto frequencyParamPosition = Vec(40.0, 45.0); @@ -317,48 +317,48 @@ struct XCOWidget : ModuleWidget { auto slowLightPosition = Vec(81.0, 158.5); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob68>(frequencyParamPosition, module, XCO::FREQUENCY_PARAM, -3.0, 6.0, 0.0)); - addParam(ParamWidget::create<Knob16>(fineParamPosition, module, XCO::FINE_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<StatefulButton9>(slowParamPosition, module, XCO::SLOW_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob38>(fmParamPosition, module, XCO::FM_DEPTH_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<SliderSwitch2State14>(fmTypeParamPosition, module, XCO::FM_TYPE_PARAM, 0.0, 1.0, 1.0)); - addParam(ParamWidget::create<Knob16>(squarePwParamPosition, module, XCO::SQUARE_PW_PARAM, -0.97, 0.97, 0.0)); - addParam(ParamWidget::create<Knob16>(squarePhaseParamPosition, module, XCO::SQUARE_PHASE_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob16>(squareMixParamPosition, module, XCO::SQUARE_MIX_PARAM, 0.0, 1.0, 1.0)); - addParam(ParamWidget::create<Knob16>(sawSaturationParamPosition, module, XCO::SAW_SATURATION_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob16>(sawPhaseParamPosition, module, XCO::SAW_PHASE_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob16>(sawMixParamPosition, module, XCO::SAW_MIX_PARAM, 0.0, 1.0, 1.0)); - addParam(ParamWidget::create<Knob16>(triangleSampleParamPosition, module, XCO::TRIANGLE_SAMPLE_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob16>(trianglePhaseParamPosition, module, XCO::TRIANGLE_PHASE_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob16>(triangleMixParamPosition, module, XCO::TRIANGLE_MIX_PARAM, 0.0, 1.0, 1.0)); - addParam(ParamWidget::create<Knob16>(sineFeedbackParamPosition, module, XCO::SINE_FEEDBACK_PARAM, 0.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob16>(sinePhaseParamPosition, module, XCO::SINE_PHASE_PARAM, -1.0, 1.0, 0.0)); - addParam(ParamWidget::create<Knob16>(sineMixParamPosition, module, XCO::SINE_MIX_PARAM, 0.0, 1.0, 1.0)); - - addInput(Port::create<Port24>(fmInputPosition, Port::INPUT, module, XCO::FM_INPUT)); - addInput(Port::create<Port24>(fmDepthInputPosition, Port::INPUT, module, XCO::FM_DEPTH_INPUT)); - addInput(Port::create<Port24>(squarePwInputPosition, Port::INPUT, module, XCO::SQUARE_PW_INPUT)); - addInput(Port::create<Port24>(squarePhaseInputPosition, Port::INPUT, module, XCO::SQUARE_PHASE_INPUT)); - addInput(Port::create<Port24>(squareMixInputPosition, Port::INPUT, module, XCO::SQUARE_MIX_INPUT)); - addInput(Port::create<Port24>(sawSaturationInputPosition, Port::INPUT, module, XCO::SAW_SATURATION_INPUT)); - addInput(Port::create<Port24>(sawPhaseInputPosition, Port::INPUT, module, XCO::SAW_PHASE_INPUT)); - addInput(Port::create<Port24>(sawMixInputPosition, Port::INPUT, module, XCO::SAW_MIX_INPUT)); - addInput(Port::create<Port24>(triangleSampleInputPosition, Port::INPUT, module, XCO::TRIANGLE_SAMPLE_INPUT)); - addInput(Port::create<Port24>(trianglePhaseInputPosition, Port::INPUT, module, XCO::TRIANGLE_PHASE_INPUT)); - addInput(Port::create<Port24>(triangleMixInputPosition, Port::INPUT, module, XCO::TRIANGLE_MIX_INPUT)); - addInput(Port::create<Port24>(sineFeedbackInputPosition, Port::INPUT, module, XCO::SINE_FEEDBACK_INPUT)); - addInput(Port::create<Port24>(sinePhaseInputPosition, Port::INPUT, module, XCO::SINE_PHASE_INPUT)); - addInput(Port::create<Port24>(sineMixInputPosition, Port::INPUT, module, XCO::SINE_MIX_INPUT)); - addInput(Port::create<Port24>(pitchInputPosition, Port::INPUT, module, XCO::PITCH_INPUT)); - addInput(Port::create<Port24>(syncInputPosition, Port::INPUT, module, XCO::SYNC_INPUT)); - - addOutput(Port::create<Port24>(squareOutputPosition, Port::OUTPUT, module, XCO::SQUARE_OUTPUT)); - addOutput(Port::create<Port24>(sawOutputPosition, Port::OUTPUT, module, XCO::SAW_OUTPUT)); - addOutput(Port::create<Port24>(triangleOutputPosition, Port::OUTPUT, module, XCO::TRIANGLE_OUTPUT)); - addOutput(Port::create<Port24>(sineOutputPosition, Port::OUTPUT, module, XCO::SINE_OUTPUT)); - addOutput(Port::create<Port24>(mixOutputPosition, Port::OUTPUT, module, XCO::MIX_OUTPUT)); - - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(slowLightPosition, module, XCO::SLOW_LIGHT)); + addParam(createParam<Knob68>(frequencyParamPosition, module, XCO::FREQUENCY_PARAM, -3.0, 6.0, 0.0)); + addParam(createParam<Knob16>(fineParamPosition, module, XCO::FINE_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<StatefulButton9>(slowParamPosition, module, XCO::SLOW_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<Knob38>(fmParamPosition, module, XCO::FM_DEPTH_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<SliderSwitch2State14>(fmTypeParamPosition, module, XCO::FM_TYPE_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<Knob16>(squarePwParamPosition, module, XCO::SQUARE_PW_PARAM, -0.97, 0.97, 0.0)); + addParam(createParam<Knob16>(squarePhaseParamPosition, module, XCO::SQUARE_PHASE_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob16>(squareMixParamPosition, module, XCO::SQUARE_MIX_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<Knob16>(sawSaturationParamPosition, module, XCO::SAW_SATURATION_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<Knob16>(sawPhaseParamPosition, module, XCO::SAW_PHASE_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob16>(sawMixParamPosition, module, XCO::SAW_MIX_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<Knob16>(triangleSampleParamPosition, module, XCO::TRIANGLE_SAMPLE_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<Knob16>(trianglePhaseParamPosition, module, XCO::TRIANGLE_PHASE_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob16>(triangleMixParamPosition, module, XCO::TRIANGLE_MIX_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam<Knob16>(sineFeedbackParamPosition, module, XCO::SINE_FEEDBACK_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<Knob16>(sinePhaseParamPosition, module, XCO::SINE_PHASE_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob16>(sineMixParamPosition, module, XCO::SINE_MIX_PARAM, 0.0, 1.0, 1.0)); + + addInput(createPort<Port24>(fmInputPosition, PortWidget::INPUT, module, XCO::FM_INPUT)); + addInput(createPort<Port24>(fmDepthInputPosition, PortWidget::INPUT, module, XCO::FM_DEPTH_INPUT)); + addInput(createPort<Port24>(squarePwInputPosition, PortWidget::INPUT, module, XCO::SQUARE_PW_INPUT)); + addInput(createPort<Port24>(squarePhaseInputPosition, PortWidget::INPUT, module, XCO::SQUARE_PHASE_INPUT)); + addInput(createPort<Port24>(squareMixInputPosition, PortWidget::INPUT, module, XCO::SQUARE_MIX_INPUT)); + addInput(createPort<Port24>(sawSaturationInputPosition, PortWidget::INPUT, module, XCO::SAW_SATURATION_INPUT)); + addInput(createPort<Port24>(sawPhaseInputPosition, PortWidget::INPUT, module, XCO::SAW_PHASE_INPUT)); + addInput(createPort<Port24>(sawMixInputPosition, PortWidget::INPUT, module, XCO::SAW_MIX_INPUT)); + addInput(createPort<Port24>(triangleSampleInputPosition, PortWidget::INPUT, module, XCO::TRIANGLE_SAMPLE_INPUT)); + addInput(createPort<Port24>(trianglePhaseInputPosition, PortWidget::INPUT, module, XCO::TRIANGLE_PHASE_INPUT)); + addInput(createPort<Port24>(triangleMixInputPosition, PortWidget::INPUT, module, XCO::TRIANGLE_MIX_INPUT)); + addInput(createPort<Port24>(sineFeedbackInputPosition, PortWidget::INPUT, module, XCO::SINE_FEEDBACK_INPUT)); + addInput(createPort<Port24>(sinePhaseInputPosition, PortWidget::INPUT, module, XCO::SINE_PHASE_INPUT)); + addInput(createPort<Port24>(sineMixInputPosition, PortWidget::INPUT, module, XCO::SINE_MIX_INPUT)); + addInput(createPort<Port24>(pitchInputPosition, PortWidget::INPUT, module, XCO::PITCH_INPUT)); + addInput(createPort<Port24>(syncInputPosition, PortWidget::INPUT, module, XCO::SYNC_INPUT)); + + addOutput(createPort<Port24>(squareOutputPosition, PortWidget::OUTPUT, module, XCO::SQUARE_OUTPUT)); + addOutput(createPort<Port24>(sawOutputPosition, PortWidget::OUTPUT, module, XCO::SAW_OUTPUT)); + addOutput(createPort<Port24>(triangleOutputPosition, PortWidget::OUTPUT, module, XCO::TRIANGLE_OUTPUT)); + addOutput(createPort<Port24>(sineOutputPosition, PortWidget::OUTPUT, module, XCO::SINE_OUTPUT)); + addOutput(createPort<Port24>(mixOutputPosition, PortWidget::OUTPUT, module, XCO::MIX_OUTPUT)); + + addChild(createLight<SmallLight<GreenLight>>(slowLightPosition, module, XCO::SLOW_LIGHT)); } }; diff --git a/src/XFade.cpp b/src/XFade.cpp @@ -49,8 +49,8 @@ struct XFadeWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); // generated by svg_widgets.rb auto mixParamPosition = Vec(8.0, 36.0); @@ -66,23 +66,23 @@ struct XFadeWidget : ModuleWidget { auto linearLightPosition = Vec(6.5, 177.5); // end generated by svg_widgets.rb - addParam(ParamWidget::create<Knob29>(mixParamPosition, module, XFade::MIX_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam<Knob29>(mixParamPosition, module, XFade::MIX_PARAM, -1.0, 1.0, 0.0)); { - auto w = ParamWidget::create<Knob16>(curveParamPosition, module, XFade::CURVE_PARAM, 0.0, 1.0, 0.5); + auto w = createParam<Knob16>(curveParamPosition, module, XFade::CURVE_PARAM, 0.0, 1.0, 0.5); auto k = dynamic_cast<SVGKnob*>(w); k->minAngle = -0.5 * M_PI; k->maxAngle = 0.5 * M_PI; addParam(w); } - addParam(ParamWidget::create<StatefulButton9>(linearParamPosition, module, XFade::LINEAR_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam<StatefulButton9>(linearParamPosition, module, XFade::LINEAR_PARAM, 0.0, 1.0, 0.0)); - addInput(Port::create<Port24>(mixInputPosition, Port::INPUT, module, XFade::MIX_INPUT)); - addInput(Port::create<Port24>(aInputPosition, Port::INPUT, module, XFade::A_INPUT)); - addInput(Port::create<Port24>(bInputPosition, Port::INPUT, module, XFade::B_INPUT)); + addInput(createPort<Port24>(mixInputPosition, PortWidget::INPUT, module, XFade::MIX_INPUT)); + addInput(createPort<Port24>(aInputPosition, PortWidget::INPUT, module, XFade::A_INPUT)); + addInput(createPort<Port24>(bInputPosition, PortWidget::INPUT, module, XFade::B_INPUT)); - addOutput(Port::create<Port24>(outOutputPosition, Port::OUTPUT, module, XFade::OUT_OUTPUT)); + addOutput(createPort<Port24>(outOutputPosition, PortWidget::OUTPUT, module, XFade::OUT_OUTPUT)); - addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(linearLightPosition, module, XFade::LINEAR_LIGHT)); + addChild(createLight<SmallLight<GreenLight>>(linearLightPosition, module, XFade::LINEAR_LIGHT)); } }; diff --git a/src/template_panels.cpp b/src/template_panels.cpp @@ -12,8 +12,8 @@ struct ThreeHPWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); } }; @@ -31,8 +31,8 @@ struct SixHPWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); } }; @@ -50,8 +50,8 @@ struct EightHPWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); } }; @@ -69,10 +69,10 @@ struct TenHPWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 0))); - addChild(Widget::create<ScrewSilver>(Vec(0, 365))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 0))); + addChild(createWidget<ScrewSilver>(Vec(0, 365))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); } }; @@ -90,10 +90,10 @@ struct TwelveHPWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 0))); - addChild(Widget::create<ScrewSilver>(Vec(0, 365))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 0))); + addChild(createWidget<ScrewSilver>(Vec(0, 365))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); } }; @@ -110,10 +110,10 @@ struct ThirteenHPWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(0, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 0))); - addChild(Widget::create<ScrewSilver>(Vec(0, 365))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + addChild(createWidget<ScrewSilver>(Vec(0, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 0))); + addChild(createWidget<ScrewSilver>(Vec(0, 365))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365))); } }; @@ -131,10 +131,10 @@ struct FifteenHPWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(15, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 0))); - addChild(Widget::create<ScrewSilver>(Vec(15, 365))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 365))); + addChild(createWidget<ScrewSilver>(Vec(15, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0))); + addChild(createWidget<ScrewSilver>(Vec(15, 365))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 365))); } }; @@ -152,10 +152,10 @@ struct EighteenHPWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(15, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 0))); - addChild(Widget::create<ScrewSilver>(Vec(15, 365))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 365))); + addChild(createWidget<ScrewSilver>(Vec(15, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0))); + addChild(createWidget<ScrewSilver>(Vec(15, 365))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 365))); } }; @@ -173,10 +173,10 @@ struct TwentyHPWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(15, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 0))); - addChild(Widget::create<ScrewSilver>(Vec(15, 365))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 365))); + addChild(createWidget<ScrewSilver>(Vec(15, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0))); + addChild(createWidget<ScrewSilver>(Vec(15, 365))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 365))); } }; @@ -194,10 +194,10 @@ struct TwentyTwoHPWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(15, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 0))); - addChild(Widget::create<ScrewSilver>(Vec(15, 365))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 365))); + addChild(createWidget<ScrewSilver>(Vec(15, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0))); + addChild(createWidget<ScrewSilver>(Vec(15, 365))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 365))); } }; @@ -215,10 +215,10 @@ struct TwentyFiveHPWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(15, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 0))); - addChild(Widget::create<ScrewSilver>(Vec(15, 365))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 365))); + addChild(createWidget<ScrewSilver>(Vec(15, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0))); + addChild(createWidget<ScrewSilver>(Vec(15, 365))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 365))); } }; @@ -236,10 +236,10 @@ struct ThirtyHPWidget : ModuleWidget { addChild(panel); } - addChild(Widget::create<ScrewSilver>(Vec(15, 0))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 0))); - addChild(Widget::create<ScrewSilver>(Vec(15, 365))); - addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 365))); + addChild(createWidget<ScrewSilver>(Vec(15, 0))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0))); + addChild(createWidget<ScrewSilver>(Vec(15, 365))); + addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 365))); } };