commit 2b61ea27599256bbc935215a88586f0e0556b90b parent 3d7cbde7d4d3522951962a6148bd609809fe7577 Author: Matt Demanett <matt@demanett.net> Date: Wed, 5 Aug 2020 04:18:06 -0400 Add hook for common context menu items for all modules. Diffstat:
95 files changed, 161 insertions(+), 150 deletions(-)
diff --git a/src/AD.cpp b/src/AD.cpp @@ -124,7 +124,7 @@ void AD::postProcessAlways(const ProcessArgs& args) { lights[DECAY_LIGHT].value = _decayLightSum * _inverseChannels; } -struct ADWidget : ModuleWidget { +struct ADWidget : BGModuleWidget { static constexpr int hp = 3; ADWidget(AD* module) { @@ -176,7 +176,7 @@ struct ADWidget : ModuleWidget { addChild(createLight<TinyLight<GreenLight>>(decayLightPosition, module, AD::DECAY_LIGHT)); } - void appendContextMenu(Menu* menu) override { + void contextMenu(Menu* menu) override { auto m = dynamic_cast<AD*>(module); assert(m); menu->addChild(new MenuLabel()); diff --git a/src/ADSR.cpp b/src/ADSR.cpp @@ -94,7 +94,7 @@ void ADSR::postProcessAlways(const ProcessArgs& args) { lights[RELEASE_LIGHT].value = _releaseLightSum * _inverseChannels; } -struct ADSRWidget : ModuleWidget { +struct ADSRWidget : BGModuleWidget { static constexpr int hp = 3; ADSRWidget(ADSR* module) { @@ -144,7 +144,7 @@ struct ADSRWidget : ModuleWidget { addChild(createLight<TinyLight<GreenLight>>(releaseLightPosition, module, ADSR::RELEASE_LIGHT)); } - void appendContextMenu(Menu* menu) override { + void contextMenu(Menu* menu) override { auto m = dynamic_cast<ADSR*>(module); assert(m); menu->addChild(new MenuLabel()); diff --git a/src/AMRM.cpp b/src/AMRM.cpp @@ -51,7 +51,7 @@ void AMRM::processChannel(const ProcessArgs& args, int c) { outputs[OUT_OUTPUT].setVoltage(_saturator.next(modulator * inputs[CARRIER_INPUT].getPolyVoltage(c) * 0.2f), c); } -struct AMRMWidget : ModuleWidget { +struct AMRMWidget : BGModuleWidget { static constexpr int hp = 6; AMRMWidget(AMRM* module) { @@ -93,7 +93,7 @@ struct AMRMWidget : ModuleWidget { addOutput(createOutput<Port24>(outOutputPosition, module, AMRM::OUT_OUTPUT)); } - void appendContextMenu(Menu* menu) override { + void contextMenu(Menu* menu) override { auto m = dynamic_cast<AMRM*>(module); assert(m); menu->addChild(new MenuLabel()); diff --git a/src/ASR.cpp b/src/ASR.cpp @@ -111,7 +111,7 @@ void ASR::postProcessAlways(const ProcessArgs& args) { lights[RELEASE_LIGHT].value = _releaseLightSum * _inverseChannels; } -struct ASRWidget : ModuleWidget { +struct ASRWidget : BGModuleWidget { static constexpr int hp = 3; ASRWidget(ASR* module) { diff --git a/src/Additator.cpp b/src/Additator.cpp @@ -213,7 +213,7 @@ float Additator::cvValue(int c, Input& cv, bool dc) { return clamp(cv.getPolyVoltage(c) / 5.0f, -1.0f, 1.0f); } -struct AdditatorWidget : ModuleWidget { +struct AdditatorWidget : BGModuleWidget { static constexpr int hp = 15; AdditatorWidget(Additator* module) { diff --git a/src/AddrSeq.cpp b/src/AddrSeq.cpp @@ -115,8 +115,8 @@ struct AddrSeqWidget : AddressableSequenceModuleWidget { addChild(createLight<SmallLight<GreenLight>>(out8LightPosition, module, AddrSeq::OUT8_LIGHT)); } - void appendContextMenu(Menu* menu) override { - AddressableSequenceModuleWidget::appendContextMenu(menu); + void contextMenu(Menu* menu) override { + AddressableSequenceModuleWidget::contextMenu(menu); OutputRangeOptionMenuItem::addOutputRangeOptionsToMenu(module, menu); } }; diff --git a/src/Analyzer.cpp b/src/Analyzer.cpp @@ -77,7 +77,7 @@ void Analyzer::processChannel(const ProcessArgs& args, int _c) { lights[WINDOW_KAISER_LIGHT].value = _core._window == AnalyzerCore::WINDOW_KAISER; } -struct AnalyzerWidget : ModuleWidget { +struct AnalyzerWidget : BGModuleWidget { static constexpr int hp = 20; AnalyzerWidget(Analyzer* module) { @@ -152,7 +152,7 @@ struct AnalyzerWidget : ModuleWidget { addChild(createLight<SmallLight<GreenLight>>(windowKaiserLightPosition, module, Analyzer::WINDOW_KAISER_LIGHT)); } - void appendContextMenu(Menu* menu) override { + void contextMenu(Menu* menu) override { auto a = dynamic_cast<Analyzer*>(module); assert(a); diff --git a/src/AnalyzerXL.cpp b/src/AnalyzerXL.cpp @@ -124,7 +124,7 @@ void AnalyzerXL::processChannel(const ProcessArgs& args, int _c) { } } -struct AnalyzerXLWidget : ModuleWidget { +struct AnalyzerXLWidget : BGModuleWidget { static constexpr int hp = 42; AnalyzerXLWidget(AnalyzerXL* module) { @@ -168,7 +168,7 @@ struct AnalyzerXLWidget : ModuleWidget { addInput(createInput<Port24>(signalhInputPosition, module, AnalyzerXL::SIGNALH_INPUT)); } - void appendContextMenu(Menu* menu) override { + void contextMenu(Menu* menu) override { auto a = dynamic_cast<AnalyzerXL*>(module); assert(a); diff --git a/src/Arp.cpp b/src/Arp.cpp @@ -351,7 +351,7 @@ void Arp::dropAllNotes() { } } -struct ArpWidget : ModuleWidget { +struct ArpWidget : BGModuleWidget { static constexpr int hp = 3; ArpWidget(Arp* module) { @@ -411,7 +411,7 @@ struct ArpWidget : ModuleWidget { addChild(createLight<SmallLight<GreenLight>>(shuffleLightPosition, module, Arp::SHUFFLE_LIGHT)); } - void appendContextMenu(Menu* menu) override { + void contextMenu(Menu* menu) override { auto m = dynamic_cast<Arp*>(module); assert(m); menu->addChild(new MenuLabel()); diff --git a/src/Assign.cpp b/src/Assign.cpp @@ -105,7 +105,7 @@ void Assign::postProcess(const ProcessArgs& args) { } } -struct AssignWidget : ModuleWidget { +struct AssignWidget : BGModuleWidget { static constexpr int hp = 3; AssignWidget(Assign* module) { diff --git a/src/Blank3.cpp b/src/Blank3.cpp @@ -64,7 +64,7 @@ struct Blank3Display : OpaqueWidget { } }; -struct Blank3Widget : ModuleWidget { +struct Blank3Widget : BGModuleWidget { static constexpr int hp = 3; Blank3Widget(Blank3* module) { diff --git a/src/Blank6.cpp b/src/Blank6.cpp @@ -64,7 +64,7 @@ struct Blank6Display : OpaqueWidget { } }; -struct Blank6Widget : ModuleWidget { +struct Blank6Widget : BGModuleWidget { static constexpr int hp = 6; Blank6Widget(Blank6* module) { diff --git a/src/Bool.cpp b/src/Bool.cpp @@ -20,7 +20,7 @@ void Bool::processAll(const ProcessArgs& args) { } } -struct BoolWidget : ModuleWidget { +struct BoolWidget : BGModuleWidget { static constexpr int hp = 3; BoolWidget(Bool* module) { diff --git a/src/CVD.cpp b/src/CVD.cpp @@ -60,7 +60,7 @@ void CVD::processChannel(const ProcessArgs& args, int c) { outputs[OUT_OUTPUT].setVoltage(e.mix.next(in, delayed), c); } -struct CVDWidget : ModuleWidget { +struct CVDWidget : BGModuleWidget { static constexpr int hp = 3; CVDWidget(CVD* module) { diff --git a/src/Clpr.cpp b/src/Clpr.cpp @@ -62,7 +62,7 @@ void Clpr::processChannel(const ProcessArgs& args, int c) { } } -struct ClprWidget : ModuleWidget { +struct ClprWidget : BGModuleWidget { static constexpr int hp = 6; ClprWidget(Clpr* module) { diff --git a/src/Cmp.cpp b/src/Cmp.cpp @@ -150,7 +150,7 @@ void Cmp::stepChannel( } } -struct CmpWidget : ModuleWidget { +struct CmpWidget : BGModuleWidget { static constexpr int hp = 6; CmpWidget(Cmp* module) { diff --git a/src/CmpDist.cpp b/src/CmpDist.cpp @@ -118,7 +118,7 @@ void CmpDist::processChannel(const ProcessArgs& args, int c) { outputs[MIX_OUTPUT].setVoltage(mix, c); } -struct CmpDistWidget : ModuleWidget { +struct CmpDistWidget : BGModuleWidget { static constexpr int hp = 10; CmpDistWidget(CmpDist* module) { diff --git a/src/Detune.cpp b/src/Detune.cpp @@ -43,7 +43,7 @@ void Detune::processChannel(const ProcessArgs& args, int c) { outputs[OUT_MINUS_OUTPUT].setVoltage(_minusCV[c], c); } -struct DetuneWidget : ModuleWidget { +struct DetuneWidget : BGModuleWidget { static constexpr int hp = 3; DetuneWidget(Detune* module) { diff --git a/src/EQ.cpp b/src/EQ.cpp @@ -49,7 +49,7 @@ void EQ::processChannel(const ProcessArgs& args, int c) { outputs[OUT_OUTPUT].setVoltage(_engines[c]->next(inputs[IN_INPUT].getVoltage(c)), c); } -struct EQWidget : ModuleWidget { +struct EQWidget : BGModuleWidget { static constexpr int hp = 3; EQWidget(EQ* module) { diff --git a/src/EQS.cpp b/src/EQS.cpp @@ -58,7 +58,7 @@ void EQS::processChannel(const ProcessArgs& args, int c) { outputs[RIGHT_OUTPUT].setVoltage(_engines[c]->_right.next(inputs[RIGHT_INPUT].getVoltage(c)), c); } -struct EQSWidget : ModuleWidget { +struct EQSWidget : BGModuleWidget { static constexpr int hp = 6; EQSWidget(EQS* module) { diff --git a/src/Edge.cpp b/src/Edge.cpp @@ -94,7 +94,7 @@ void Edge::postProcessAlways(const ProcessArgs& args) { lights[HIGH_LIGHT].value = _highLightSum * _inverseChannels; } -struct EdgeWidget : ModuleWidget { +struct EdgeWidget : BGModuleWidget { static constexpr int hp = 3; EdgeWidget(Edge* module) { diff --git a/src/EightFO.cpp b/src/EightFO.cpp @@ -192,7 +192,7 @@ void EightFO::updateOutput(int c, bool useSample, Output& output, Phasor::phase_ } } -struct EightFOWidget : ModuleWidget { +struct EightFOWidget : BGModuleWidget { static constexpr int hp = 17; EightFOWidget(EightFO* module) { diff --git a/src/FFB.cpp b/src/FFB.cpp @@ -135,7 +135,7 @@ void FFB::processChannel(const ProcessArgs& args, int c) { outputs[EVEN_OUTPUT].setVoltage(outEven, c); } -struct FFBWidget : ModuleWidget { +struct FFBWidget : BGModuleWidget { static constexpr int hp = 8; FFBWidget(FFB* module) { diff --git a/src/FMOp.cpp b/src/FMOp.cpp @@ -259,7 +259,7 @@ void FMOp::postProcessAlways(const ProcessArgs& args) { lights[RELEASE_LIGHT].value = _releaseLightSum * _inverseChannels; } -struct FMOpWidget : ModuleWidget { +struct FMOpWidget : BGModuleWidget { static constexpr int hp = 10; FMOpWidget(FMOp* module) { @@ -337,7 +337,7 @@ struct FMOpWidget : ModuleWidget { addChild(createLight<TinyLight<GreenLight>>(releaseLightPosition, module, FMOp::RELEASE_LIGHT)); } - void appendContextMenu(Menu* menu) override { + void contextMenu(Menu* menu) override { auto fmop = dynamic_cast<FMOp*>(module); assert(fmop); menu->addChild(new MenuLabel()); diff --git a/src/FlipFlop.cpp b/src/FlipFlop.cpp @@ -77,7 +77,7 @@ void FlipFlop::channelStep( } } -struct FlipFlopWidget : ModuleWidget { +struct FlipFlopWidget : BGModuleWidget { static constexpr int hp = 3; FlipFlopWidget(FlipFlop* module) { diff --git a/src/Follow.cpp b/src/Follow.cpp @@ -30,7 +30,7 @@ void Follow::processChannel(const ProcessArgs& args, int c) { outputs[OUT_OUTPUT].setVoltage(_saturator.next(e.gain.next(e.follower.next(inputs[IN_INPUT].getVoltage(c)))), c); } -struct FollowWidget : ModuleWidget { +struct FollowWidget : BGModuleWidget { static constexpr int hp = 3; FollowWidget(Follow* module) { diff --git a/src/Inv.cpp b/src/Inv.cpp @@ -100,7 +100,7 @@ void Inv::processDual(int i) { lights[LOW1_LIGHT + 2 * i].value = 1.0f - red; } -struct InvWidget : ModuleWidget { +struct InvWidget : BGModuleWidget { static constexpr int hp = 3; InvWidget(Inv* module) { @@ -152,7 +152,7 @@ struct InvWidget : ModuleWidget { addChild(createLight<SmallLight<GreenRedLight>>(low2LightPosition, module, Inv::LOW2_LIGHT)); } - void appendContextMenu(Menu* menu) override { + void contextMenu(Menu* menu) override { auto m = dynamic_cast<Inv*>(module); assert(m); menu->addChild(new MenuLabel()); diff --git a/src/LFO.cpp b/src/LFO.cpp @@ -134,7 +134,7 @@ void LFO::updateOutput(int c, Phasor& wave, bool useSample, bool invert, Output& } } -struct LFOWidget : ModuleWidget { +struct LFOWidget : BGModuleWidget { static constexpr int hp = 10; LFOWidget(LFO* module) { diff --git a/src/LLFO.cpp b/src/LLFO.cpp @@ -94,7 +94,7 @@ void LLFO::processChannel(const ProcessArgs& args, int c) { outputs[OUT_OUTPUT].setVoltage(sample, c); } -struct LLFOWidget : ModuleWidget { +struct LLFOWidget : BGModuleWidget { static constexpr int hp = 3; LLFOWidget(LLFO* module) { diff --git a/src/LVCF.cpp b/src/LVCF.cpp @@ -150,7 +150,7 @@ void LVCF::processChannel(const ProcessArgs& args, int c) { outputs[OUT_OUTPUT].setVoltage(_engines[c]->next(inputs[IN_INPUT].getVoltage(c)), c); } -struct LVCFWidget : ModuleWidget { +struct LVCFWidget : BGModuleWidget { static constexpr int hp = 3; LVCFWidget(LVCF* module) { @@ -200,7 +200,7 @@ struct LVCFWidget : ModuleWidget { addChild(createLight<SmallLight<GreenLight>>(bandrejectLightPosition, module, LVCF::BANDREJECT_LIGHT)); } - void appendContextMenu(Menu* menu) override { + void contextMenu(Menu* menu) override { auto m = dynamic_cast<LVCF*>(module); assert(m); menu->addChild(new MenuLabel()); diff --git a/src/LVCO.cpp b/src/LVCO.cpp @@ -82,7 +82,7 @@ void LVCO::processChannel(const ProcessArgs& args, int c) { outputs[OUT_OUTPUT].setVoltage(e.squareOut + e.sawOut + e.triangleOut + e.sineOut, c); } -struct LVCOWidget : ModuleWidget { +struct LVCOWidget : BGModuleWidget { static constexpr int hp = 3; LVCOWidget(LVCO* module) { @@ -138,7 +138,7 @@ struct LVCOWidget : ModuleWidget { addChild(createLight<SmallLight<GreenLight>>(pulse10LightPosition, module, LVCO::PULSE_10_LIGHT)); } - void appendContextMenu(Menu* menu) override { + void contextMenu(Menu* menu) override { auto m = dynamic_cast<LVCO*>(module); assert(m); menu->addChild(new MenuLabel()); diff --git a/src/Lag.cpp b/src/Lag.cpp @@ -42,7 +42,7 @@ void Lag::processChannel(const ProcessArgs& args, int _c) { outputs[OUT_OUTPUT].setVoltage(_slew.next(inputs[IN_INPUT].getVoltageSum())); } -struct LagWidget : ModuleWidget { +struct LagWidget : BGModuleWidget { static constexpr int hp = 3; LagWidget(Lag* module) { diff --git a/src/Lmtr.cpp b/src/Lmtr.cpp @@ -84,7 +84,7 @@ void Lmtr::processChannel(const ProcessArgs& args, int c) { } } -struct LmtrWidget : ModuleWidget { +struct LmtrWidget : BGModuleWidget { static constexpr int hp = 6; LmtrWidget(Lmtr* module) { diff --git a/src/Mix1.cpp b/src/Mix1.cpp @@ -48,7 +48,7 @@ void Mix1::postProcessAlways(const ProcessArgs& args) { _rms = _rmsSum * _inverseChannels; } -struct Mix1Widget : ModuleWidget { +struct Mix1Widget : BGModuleWidget { static constexpr int hp = 3; Mix1Widget(Mix1* module) { diff --git a/src/Mix2.cpp b/src/Mix2.cpp @@ -60,7 +60,7 @@ void Mix2::postProcessAlways(const ProcessArgs& args) { _rightRms = _rightRmsSum * _inverseChannels; } -struct Mix2Widget : ModuleWidget { +struct Mix2Widget : BGModuleWidget { static constexpr int hp = 5; Mix2Widget(Mix2* module) { diff --git a/src/Mix4.cpp b/src/Mix4.cpp @@ -260,8 +260,8 @@ struct Mix4Widget : DimmableMixerWidget { addParam(slider); } - void appendContextMenu(Menu* menu) override { - DimmableMixerWidget::appendContextMenu(menu); + void contextMenu(Menu* menu) override { + DimmableMixerWidget::contextMenu(menu); auto m = dynamic_cast<Mix4*>(module); assert(m); OptionsMenuItem* mi = new OptionsMenuItem("Input 1 poly spread"); diff --git a/src/Mix4x.cpp b/src/Mix4x.cpp @@ -89,7 +89,7 @@ void Mix4x::processAll(const ProcessArgs& args) { } } -struct Mix4xWidget : ModuleWidget { +struct Mix4xWidget : BGModuleWidget { static constexpr int hp = 15; Mix4xWidget(Mix4x* module) { diff --git a/src/Mix8.cpp b/src/Mix8.cpp @@ -316,8 +316,8 @@ struct Mix8Widget : DimmableMixerWidget { addParam(slider); } - void appendContextMenu(Menu* menu) override { - DimmableMixerWidget::appendContextMenu(menu); + void contextMenu(Menu* menu) override { + DimmableMixerWidget::contextMenu(menu); auto m = dynamic_cast<Mix8*>(module); assert(m); OptionsMenuItem* mi = new OptionsMenuItem("Input 1 poly spread"); diff --git a/src/Mix8x.cpp b/src/Mix8x.cpp @@ -89,7 +89,7 @@ void Mix8x::processAll(const ProcessArgs& args) { } } -struct Mix8xWidget : ModuleWidget { +struct Mix8xWidget : BGModuleWidget { static constexpr int hp = 27; Mix8xWidget(Mix8x* module) { diff --git a/src/Mono.cpp b/src/Mono.cpp @@ -54,7 +54,7 @@ void Mono::processAll(const ProcessArgs& args) { outputs[MONO_OUTPUT].setVoltage(out); } -struct MonoWidget : ModuleWidget { +struct MonoWidget : BGModuleWidget { struct ChannelsDisplay : OpaqueWidget { const NVGcolor inactiveBgColor = nvgRGBA(0xaa, 0xaa, 0xaa, 0xff); const NVGcolor activeBgColor = nvgRGBA(0x66, 0x66, 0x66, 0xff); diff --git a/src/Mult.cpp b/src/Mult.cpp @@ -23,7 +23,7 @@ void Mult::processChannel(const ProcessArgs& args, int _c) { outputs[OUTB3_OUTPUT].writeVoltages(out); } -struct MultWidget : ModuleWidget { +struct MultWidget : BGModuleWidget { static constexpr int hp = 3; MultWidget(Mult* module) { diff --git a/src/Mute8.cpp b/src/Mute8.cpp @@ -89,7 +89,7 @@ void Mute8::stepChannel(int i, bool solo) { } } -struct Mute8Widget : ModuleWidget { +struct Mute8Widget : BGModuleWidget { static constexpr int hp = 10; Mute8Widget(Mute8* module) { @@ -199,7 +199,7 @@ struct Mute8Widget : ModuleWidget { addChild(createLight<SmallLight<GreenLight>>(mute8LightPosition, module, Mute8::MUTE8_LIGHT)); } - void appendContextMenu(Menu* menu) override { + void contextMenu(Menu* menu) override { auto m = dynamic_cast<Mute8*>(module); assert(m); menu->addChild(new MenuLabel()); diff --git a/src/Noise.cpp b/src/Noise.cpp @@ -36,7 +36,7 @@ void Noise::processAll(const ProcessArgs& args) { } } -struct NoiseWidget : ModuleWidget { +struct NoiseWidget : BGModuleWidget { static constexpr int hp = 3; NoiseWidget(Noise* module) { @@ -74,7 +74,7 @@ struct NoiseWidget : ModuleWidget { addOutput(createOutput<Port24>(absOutputPosition, module, Noise::ABS_OUTPUT)); } - void appendContextMenu(Menu* menu) override { + void contextMenu(Menu* menu) override { auto m = dynamic_cast<Noise*>(module); assert(m); menu->addChild(new MenuLabel()); diff --git a/src/Nsgt.cpp b/src/Nsgt.cpp @@ -90,7 +90,7 @@ void Nsgt::processChannel(const ProcessArgs& args, int c) { } } -struct NsgtWidget : ModuleWidget { +struct NsgtWidget : BGModuleWidget { static constexpr int hp = 6; NsgtWidget(Nsgt* module) { diff --git a/src/PEQ.cpp b/src/PEQ.cpp @@ -68,7 +68,7 @@ void PEQ::postProcessAlways(const ProcessArgs& args) { lights[C_LIGHT].value = _rmsSums[2] * _inverseChannels; } -struct PEQWidget : ModuleWidget { +struct PEQWidget : BGModuleWidget { static constexpr int hp = 10; PEQWidget(PEQ* module) { diff --git a/src/PEQ14.cpp b/src/PEQ14.cpp @@ -118,7 +118,7 @@ void PEQ14::postProcessAlways(const ProcessArgs& args) { lights[FMOD_FULL_LIGHT].value = _fullFrequencyMode; } -struct PEQ14Widget : ModuleWidget { +struct PEQ14Widget : BGModuleWidget { static constexpr int hp = 46; PEQ14Widget(PEQ14* module) { diff --git a/src/PEQ14XF.cpp b/src/PEQ14XF.cpp @@ -64,7 +64,7 @@ void PEQ14XF::processChannel(const ProcessArgs& args, int c) { } } -struct PEQ14XFWidget : ModuleWidget { +struct PEQ14XFWidget : BGModuleWidget { static constexpr int hp = 5; PEQ14XFWidget(PEQ14XF* module) { diff --git a/src/PEQ14XR.cpp b/src/PEQ14XR.cpp @@ -83,7 +83,7 @@ void PEQ14XR::processChannel(const ProcessArgs& args, int c) { } } -struct PEQ14XRWidget : ModuleWidget { +struct PEQ14XRWidget : BGModuleWidget { static constexpr int hp = 5; PEQ14XRWidget(PEQ14XR* module) { diff --git a/src/PEQ14XV.cpp b/src/PEQ14XV.cpp @@ -155,7 +155,7 @@ void PEQ14XV::processChannel(const ProcessArgs& args, int c) { } } -struct PEQ14XVWidget : ModuleWidget { +struct PEQ14XVWidget : BGModuleWidget { static constexpr int hp = 5; PEQ14XVWidget(PEQ14XV* module) { diff --git a/src/PEQ6.cpp b/src/PEQ6.cpp @@ -100,7 +100,7 @@ void PEQ6::postProcessAlways(const ProcessArgs& args) { lights[FMOD_FULL_LIGHT].value = _fullFrequencyMode; } -struct PEQ6Widget : ModuleWidget { +struct PEQ6Widget : BGModuleWidget { static constexpr int hp = 21; PEQ6Widget(PEQ6* module) { diff --git a/src/PEQ6XF.cpp b/src/PEQ6XF.cpp @@ -54,7 +54,7 @@ void PEQ6XF::processChannel(const ProcessArgs& args, int c) { } } -struct PEQ6XFWidget : ModuleWidget { +struct PEQ6XFWidget : BGModuleWidget { static constexpr int hp = 3; PEQ6XFWidget(PEQ6XF* module) { diff --git a/src/Pan.cpp b/src/Pan.cpp @@ -41,7 +41,7 @@ void Pan::processChannel(const ProcessArgs& args, int c) { outputs[R_OUTPUT].setVoltage(_saturatorRight[c].next(r1 + r2), c); } -struct PanWidget : ModuleWidget { +struct PanWidget : BGModuleWidget { static constexpr int hp = 3; PanWidget(Pan* module) { diff --git a/src/Pgmr.cpp b/src/Pgmr.cpp @@ -241,8 +241,8 @@ struct PgmrWidget : AddressableSequenceBaseModuleWidget { addChild(createLight<SmallLight<GreenLight>>(select4LightPosition, module, Pgmr::SELECT4_LIGHT)); } - void appendContextMenu(Menu* menu) override { - AddressableSequenceBaseModuleWidget::appendContextMenu(menu); + void contextMenu(Menu* menu) override { + AddressableSequenceBaseModuleWidget::contextMenu(menu); auto m = dynamic_cast<Pgmr*>(module); assert(m); diff --git a/src/PgmrX.cpp b/src/PgmrX.cpp @@ -39,7 +39,7 @@ void PgmrX::processAlways(const ProcessArgs& args) { } } -struct PgmrXWidget : ModuleWidget { +struct PgmrXWidget : BGModuleWidget { static constexpr int hp = 12; PgmrXWidget(PgmrX* module) { diff --git a/src/PolyCon16.cpp b/src/PolyCon16.cpp @@ -20,7 +20,7 @@ void PolyCon16::processAll(const ProcessArgs& args) { } } -struct PolyCon16Widget : ModuleWidget { +struct PolyCon16Widget : BGModuleWidget { static constexpr int hp = 8; PolyCon16Widget(PolyCon16* module) { @@ -122,7 +122,7 @@ struct PolyCon16Widget : ModuleWidget { addChild(createLight<TinyLight<GreenLight>>(channel16LightPosition, module, PolyCon16::CHANNEL16_LIGHT)); } - void appendContextMenu(Menu* menu) override { + void contextMenu(Menu* menu) override { menu->addChild(new MenuLabel()); OutputRangeOptionMenuItem::addOutputRangeOptionsToMenu(module, menu); } diff --git a/src/PolyCon8.cpp b/src/PolyCon8.cpp @@ -17,7 +17,7 @@ void PolyCon8::processAll(const ProcessArgs& args) { } } -struct PolyCon8Widget : ModuleWidget { +struct PolyCon8Widget : BGModuleWidget { static constexpr int hp = 3; PolyCon8Widget(PolyCon8* module) { @@ -77,7 +77,7 @@ struct PolyCon8Widget : ModuleWidget { addChild(createLight<TinyLight<GreenLight>>(channel8LightPosition, module, PolyCon8::CHANNEL8_LIGHT)); } - void appendContextMenu(Menu* menu) override { + void contextMenu(Menu* menu) override { auto m = dynamic_cast<PolyCon8*>(module); assert(m); menu->addChild(new MenuLabel()); diff --git a/src/PolyMult.cpp b/src/PolyMult.cpp @@ -20,7 +20,7 @@ void PolyMult::processAll(const ProcessArgs& args) { } } -struct PolyMultWidget : ModuleWidget { +struct PolyMultWidget : BGModuleWidget { static constexpr int hp = 3; PolyMultWidget(PolyMult* module) { diff --git a/src/PolyOff16.cpp b/src/PolyOff16.cpp @@ -38,7 +38,7 @@ void PolyOff16::processAll(const ProcessArgs& args) { } } -struct PolyOff16Widget : ModuleWidget { +struct PolyOff16Widget : BGModuleWidget { static constexpr int hp = 16; PolyOff16Widget(PolyOff16* module) { @@ -206,7 +206,7 @@ struct PolyOff16Widget : ModuleWidget { addChild(createLight<TinyLight<GreenLight>>(channel16LightPosition, module, PolyOff16::CHANNEL16_LIGHT)); } - void appendContextMenu(Menu* menu) override { + void contextMenu(Menu* menu) override { menu->addChild(new MenuLabel()); OutputRangeOptionMenuItem::addOutputRangeOptionsToMenu(module, menu); } diff --git a/src/PolyOff8.cpp b/src/PolyOff8.cpp @@ -38,7 +38,7 @@ void PolyOff8::processAll(const ProcessArgs& args) { } } -struct PolyOff8Widget : ModuleWidget { +struct PolyOff8Widget : BGModuleWidget { static constexpr int hp = 8; PolyOff8Widget(PolyOff8* module) { @@ -140,7 +140,7 @@ struct PolyOff8Widget : ModuleWidget { addChild(createLight<TinyLight<GreenLight>>(channel8LightPosition, module, PolyOff8::CHANNEL8_LIGHT)); } - void appendContextMenu(Menu* menu) override { + void contextMenu(Menu* menu) override { menu->addChild(new MenuLabel()); OutputRangeOptionMenuItem::addOutputRangeOptionsToMenu(module, menu); } diff --git a/src/Pressor.cpp b/src/Pressor.cpp @@ -152,7 +152,7 @@ void Pressor::processChannel(const ProcessArgs& args, int c) { } } -struct PressorWidget : ModuleWidget { +struct PressorWidget : BGModuleWidget { struct CompressionDisplay : OpaqueWidget { struct Level { float db; diff --git a/src/Pulse.cpp b/src/Pulse.cpp @@ -53,7 +53,7 @@ void Pulse::processChannel(const ProcessArgs& args, int c) { outputs[OUT_OUTPUT].setVoltage(_engines[c]->squareOut, c); } -struct PulseWidget : ModuleWidget { +struct PulseWidget : BGModuleWidget { static constexpr int hp = 3; PulseWidget(Pulse* module) { @@ -95,7 +95,7 @@ struct PulseWidget : ModuleWidget { addOutput(createOutput<Port24>(outOutputPosition, module, Pulse::OUT_OUTPUT)); } - void appendContextMenu(Menu* menu) override { + void contextMenu(Menu* menu) override { auto m = dynamic_cast<Pulse*>(module); assert(m); menu->addChild(new MenuLabel()); diff --git a/src/Reftone.cpp b/src/Reftone.cpp @@ -189,7 +189,7 @@ float ReftoneDisplay::textRenderWidth(const DrawArgs& args, const char* s, int s return strlen(s) * (size / 2.1); } -struct ReftoneWidget : ModuleWidget { +struct ReftoneWidget : BGModuleWidget { static constexpr int hp = 3; ReftoneWidget(Reftone* module) { diff --git a/src/SampleHold.cpp b/src/SampleHold.cpp @@ -126,7 +126,7 @@ float SampleHold::noise() { } } -struct SampleHoldWidget : ModuleWidget { +struct SampleHoldWidget : BGModuleWidget { static constexpr int hp = 3; SampleHoldWidget(SampleHold* module) { @@ -189,7 +189,7 @@ struct SampleHoldWidget : ModuleWidget { {} }; - void appendContextMenu(Menu* menu) override { + void contextMenu(Menu* menu) override { auto m = dynamic_cast<SampleHold*>(module); assert(m); menu->addChild(new MenuLabel()); diff --git a/src/Sine.cpp b/src/Sine.cpp @@ -98,7 +98,7 @@ void Sine::processChannel(const ProcessArgs& args, int c) { outputs[OUT_OUTPUT].setVoltage(_outputScale * (e.squareOut + e.sawOut + e.triangleOut + e.sineOut), c); } -struct SineWidget : ModuleWidget { +struct SineWidget : BGModuleWidget { static constexpr int hp = 3; SineWidget(Sine* module) { @@ -142,7 +142,7 @@ struct SineWidget : ModuleWidget { addOutput(createOutput<Port24>(outOutputPosition, module, Sine::OUT_OUTPUT)); } - void appendContextMenu(Menu* menu) override { + void contextMenu(Menu* menu) override { auto m = dynamic_cast<Sine*>(module); assert(m); menu->addChild(new MenuLabel()); diff --git a/src/Slew.cpp b/src/Slew.cpp @@ -61,7 +61,7 @@ float Slew::shape(Param& param) { return shape; } -struct SlewWidget : ModuleWidget { +struct SlewWidget : BGModuleWidget { static constexpr int hp = 3; SlewWidget(Slew* module) { diff --git a/src/Stack.cpp b/src/Stack.cpp @@ -42,7 +42,7 @@ void Stack::processChannel(const ProcessArgs& args, int c) { outputs[OUT_OUTPUT].setVoltage(_outCV[c], c); } -struct StackWidget : ModuleWidget { +struct StackWidget : BGModuleWidget { static constexpr int hp = 3; StackWidget(Stack* module) { diff --git a/src/Switch.cpp b/src/Switch.cpp @@ -118,7 +118,7 @@ void bogaudio::Switch::postProcessAlways(const ProcessArgs& args) { lights[LOW2_LIGHT].value = _low2LightSum * _inverseChannels; } -struct SwitchWidget : ModuleWidget { +struct SwitchWidget : BGModuleWidget { static constexpr int hp = 3; SwitchWidget(bogaudio::Switch* module) { @@ -172,7 +172,7 @@ struct SwitchWidget : ModuleWidget { addChild(createLight<SmallLight<GreenLight>>(low2LightPosition, module, bogaudio::Switch::LOW2_LIGHT)); } - void appendContextMenu(Menu* menu) override { + void contextMenu(Menu* menu) override { auto m = dynamic_cast<bogaudio::Switch*>(module); assert(m); menu->addChild(new MenuLabel()); diff --git a/src/Test.cpp b/src/Test.cpp @@ -501,7 +501,7 @@ float Test::index3() { } -struct TestWidget : ModuleWidget { +struct TestWidget : BGModuleWidget { static constexpr int hp = 3; TestWidget(Test* module) { diff --git a/src/Test2.cpp b/src/Test2.cpp @@ -104,7 +104,7 @@ void Test2::processChannel(const ProcessArgs& args, int _c) { // } -struct Test2Widget : ModuleWidget { +struct Test2Widget : BGModuleWidget { static constexpr int hp = 6; Test2Widget(Test2* module) { diff --git a/src/TestExpander.cpp b/src/TestExpander.cpp @@ -20,7 +20,7 @@ void TestExpanderBase::processChannel(const ProcessArgs& args, int c) { } } -struct TestExpanderBaseWidget : ModuleWidget { +struct TestExpanderBaseWidget : BGModuleWidget { static constexpr int hp = 3; TestExpanderBaseWidget(TestExpanderBase* module) { @@ -72,7 +72,7 @@ void TestExpanderExtension::processChannel(const ProcessArgs& args, int c) { } } -struct TestExpanderExtensionWidget : ModuleWidget { +struct TestExpanderExtensionWidget : BGModuleWidget { static constexpr int hp = 3; TestExpanderExtensionWidget(TestExpanderExtension* module) { diff --git a/src/TestVCF.cpp b/src/TestVCF.cpp @@ -826,7 +826,7 @@ void TestVCF::processAll(const ProcessArgs& args) { } } -struct TestVCFWidget : ModuleWidget { +struct TestVCFWidget : BGModuleWidget { static constexpr int hp = 12; TestVCFWidget(TestVCF* module) { diff --git a/src/UMix.cpp b/src/UMix.cpp @@ -106,10 +106,10 @@ struct UMixWidget : MatrixBaseModuleWidget { addOutput(createOutput<Port24>(outOutputPosition, module, UMix::OUT_OUTPUT)); } - void appendContextMenu(Menu* menu) override { + void contextMenu(Menu* menu) override { auto m = dynamic_cast<UMix*>(module); assert(m); - MatrixBaseModuleWidget::appendContextMenu(menu); + MatrixBaseModuleWidget::contextMenu(menu); menu->addChild(new OptionMenuItem("Average", [m]() { return !m->_sum; }, [m]() { m->_sum = !m->_sum; })); } }; diff --git a/src/Unison.cpp b/src/Unison.cpp @@ -40,7 +40,7 @@ void Unison::processAll(const ProcessArgs& args) { } } -struct UnisonWidget : ModuleWidget { +struct UnisonWidget : BGModuleWidget { static constexpr int hp = 3; UnisonWidget(Unison* module) { diff --git a/src/VCA.cpp b/src/VCA.cpp @@ -44,7 +44,7 @@ void VCA::channelStep(Input& input, Output& output, Param& knob, Input& cv, Ampl } } -struct VCAWidget : ModuleWidget { +struct VCAWidget : BGModuleWidget { static constexpr int hp = 3; VCAWidget(VCA* module) { diff --git a/src/VCAmp.cpp b/src/VCAmp.cpp @@ -34,7 +34,7 @@ void VCAmp::processAll(const ProcessArgs& args) { } } -struct VCAmpWidget : ModuleWidget { +struct VCAmpWidget : BGModuleWidget { static constexpr int hp = 3; VCAmpWidget(VCAmp* module) { diff --git a/src/VCF.cpp b/src/VCF.cpp @@ -183,7 +183,7 @@ void VCF::processChannel(const ProcessArgs& args, int c) { outputs[OUT_OUTPUT].setVoltage(_engines[c]->next(inputs[IN_INPUT].getVoltage(c)), c); } -struct VCFWidget : ModuleWidget { +struct VCFWidget : BGModuleWidget { static constexpr int hp = 10; VCFWidget(VCF* module) { @@ -246,7 +246,7 @@ struct VCFWidget : ModuleWidget { addOutput(createOutput<Port24>(outOutputPosition, module, VCF::OUT_OUTPUT)); } - void appendContextMenu(Menu* menu) override { + void contextMenu(Menu* menu) override { auto m = dynamic_cast<VCF*>(module); assert(m); menu->addChild(new MenuLabel()); diff --git a/src/VCO.cpp b/src/VCO.cpp @@ -52,7 +52,7 @@ void VCO::processChannel(const ProcessArgs& args, int c) { outputs[SINE_OUTPUT].setVoltage(e.sineOut, c); } -struct VCOWidget : ModuleWidget { +struct VCOWidget : BGModuleWidget { static constexpr int hp = 10; VCOWidget(VCO* module) { @@ -110,7 +110,7 @@ struct VCOWidget : ModuleWidget { addOutput(createOutput<Port24>(sineOutputPosition, module, VCO::SINE_OUTPUT)); } - void appendContextMenu(Menu* menu) override { + void contextMenu(Menu* menu) override { auto m = dynamic_cast<VCO*>(module); assert(m); menu->addChild(new MenuLabel()); diff --git a/src/VU.cpp b/src/VU.cpp @@ -122,7 +122,7 @@ struct VUDisplay : OpaqueWidget { } }; -struct VUWidget : ModuleWidget { +struct VUWidget : BGModuleWidget { static constexpr int hp = 3; VUWidget(VU* module) { diff --git a/src/Walk.cpp b/src/Walk.cpp @@ -125,7 +125,7 @@ void Walk::processChannel(const ProcessArgs& args, int c) { outputs[OUT_OUTPUT].setVoltage(out, c); } -struct WalkWidget : ModuleWidget { +struct WalkWidget : BGModuleWidget { static constexpr int hp = 3; WalkWidget(Walk* module) { @@ -167,7 +167,7 @@ struct WalkWidget : ModuleWidget { addOutput(createOutput<Port24>(outOutputPosition, module, Walk::OUT_OUTPUT)); } - void appendContextMenu(Menu* menu) override { + void contextMenu(Menu* menu) override { auto m = dynamic_cast<Walk*>(module); assert(m); menu->addChild(new MenuLabel()); diff --git a/src/Walk2.cpp b/src/Walk2.cpp @@ -479,7 +479,7 @@ struct Walk2Display : TransparentWidget { } }; -struct Walk2Widget : ModuleWidget { +struct Walk2Widget : BGModuleWidget { static constexpr int hp = 14; Walk2Widget(Walk2* module) { @@ -559,7 +559,7 @@ struct Walk2Widget : ModuleWidget { addChild(createLight<SmallLight<GreenLight>>(trackholdLightPosition, module, Walk2::TRACKHOLD_LIGHT)); } - void appendContextMenu(Menu* menu) override { + void contextMenu(Menu* menu) override { auto m = dynamic_cast<Walk2*>(module); assert(m); diff --git a/src/XCO.cpp b/src/XCO.cpp @@ -296,7 +296,7 @@ float XCO::level(int c, Param& param, Input& input) { return v; } -struct XCOWidget : ModuleWidget { +struct XCOWidget : BGModuleWidget { static constexpr int hp = 20; XCOWidget(XCO* module) { diff --git a/src/XFade.cpp b/src/XFade.cpp @@ -43,7 +43,7 @@ void XFade::processChannel(const ProcessArgs& args, int c) { outputs[OUT_OUTPUT].setVoltage(_mixer[c].next(inputs[A_INPUT].getVoltage(c), inputs[B_INPUT].getVoltage(c)), c); } -struct XFadeWidget : ModuleWidget { +struct XFadeWidget : BGModuleWidget { static constexpr int hp = 3; XFadeWidget(XFade* module) { diff --git a/src/addressable_sequence.cpp b/src/addressable_sequence.cpp @@ -121,7 +121,7 @@ int AddressableSequenceModule::setStep(int c, int i, int n) { } -void AddressableSequenceBaseModuleWidget::appendContextMenu(Menu* menu) { +void AddressableSequenceBaseModuleWidget::contextMenu(Menu* menu) { auto m = dynamic_cast<AddressableSequenceModule*>(module); assert(m); @@ -136,8 +136,8 @@ void AddressableSequenceBaseModuleWidget::appendContextMenu(Menu* menu) { } -void AddressableSequenceModuleWidget::appendContextMenu(Menu* menu) { - AddressableSequenceBaseModuleWidget::appendContextMenu(menu); +void AddressableSequenceModuleWidget::contextMenu(Menu* menu) { + AddressableSequenceBaseModuleWidget::contextMenu(menu); auto m = dynamic_cast<AddressableSequenceModule*>(module); assert(m); diff --git a/src/addressable_sequence.hpp b/src/addressable_sequence.hpp @@ -46,12 +46,12 @@ struct AddressableSequenceModule : BGModule { int setStep(int c, int i, int n = 8); }; -struct AddressableSequenceBaseModuleWidget : ModuleWidget { - void appendContextMenu(Menu* menu) override; +struct AddressableSequenceBaseModuleWidget : BGModuleWidget { + void contextMenu(Menu* menu) override; }; struct AddressableSequenceModuleWidget : AddressableSequenceBaseModuleWidget { - void appendContextMenu(Menu* menu) override; + void contextMenu(Menu* menu) override; }; typedef OutputRangeModule<AddressableSequenceModule> OutputRangeAddressableSequenceModule; diff --git a/src/disable_output_limit.cpp b/src/disable_output_limit.cpp @@ -16,7 +16,7 @@ void DisableOutputLimitModule::fromJson(json_t* root) { } -void DisableOutputLimitModuleWidget::appendContextMenu(Menu* menu) { +void DisableOutputLimitModuleWidget::contextMenu(Menu* menu) { auto m = dynamic_cast<DisableOutputLimitModule*>(module); assert(m); menu->addChild(new MenuLabel()); diff --git a/src/disable_output_limit.hpp b/src/disable_output_limit.hpp @@ -11,8 +11,8 @@ struct DisableOutputLimitModule : BGModule { void fromJson(json_t* root) override; }; -struct DisableOutputLimitModuleWidget : ModuleWidget { - void appendContextMenu(Menu* menu) override; +struct DisableOutputLimitModuleWidget : BGModuleWidget { + void contextMenu(Menu* menu) override; }; } // namespace bogaudio diff --git a/src/matrix_base.cpp b/src/matrix_base.cpp @@ -34,7 +34,7 @@ void MatrixBaseModule::modulate() { } -void MatrixBaseModuleWidget::appendContextMenu(Menu* menu) { +void MatrixBaseModuleWidget::contextMenu(Menu* menu) { auto m = dynamic_cast<MatrixBaseModule*>(module); assert(m); menu->addChild(new MenuLabel()); @@ -135,10 +135,10 @@ void KnobMatrixModuleWidget::redrawKnobs() { } } -void KnobMatrixModuleWidget::appendContextMenu(Menu* menu) { +void KnobMatrixModuleWidget::contextMenu(Menu* menu) { auto m = dynamic_cast<KnobMatrixModule*>(module); assert(m); - MatrixBaseModuleWidget::appendContextMenu(menu); + MatrixBaseModuleWidget::contextMenu(menu); menu->addChild(new OptionMenuItem( "Indicator knobs", [m]() { return m->_indicatorKnobs; }, @@ -297,10 +297,10 @@ void SwitchMatrixModule::setColumnExclusive(bool e) { } -void SwitchMatrixModuleWidget::appendContextMenu(Menu* menu) { +void SwitchMatrixModuleWidget::contextMenu(Menu* menu) { auto m = dynamic_cast<SwitchMatrixModule*>(module); assert(m); - MatrixBaseModuleWidget::appendContextMenu(menu); + MatrixBaseModuleWidget::contextMenu(menu); OptionsMenuItem* i = new OptionsMenuItem("Inverting"); i->addItem(OptionMenuItem("By param entry (right-click)", [m]() { return m->_inverting == SwitchMatrixModule::PARAM_INVERTING; }, [m]() { m->setInverting(SwitchMatrixModule::PARAM_INVERTING); })); diff --git a/src/matrix_base.hpp b/src/matrix_base.hpp @@ -24,8 +24,8 @@ struct MatrixBaseModule : BGModule { void modulate() override; }; -struct MatrixBaseModuleWidget : ModuleWidget { - void appendContextMenu(Menu* menu) override; +struct MatrixBaseModuleWidget : BGModuleWidget { + void contextMenu(Menu* menu) override; }; struct MatrixModule : MatrixBaseModule { @@ -78,7 +78,7 @@ struct KnobMatrixModuleWidget : MatrixBaseModuleWidget { void createKnob(math::Vec& position, KnobMatrixModule* module, int id); void redrawKnobs(); - void appendContextMenu(Menu* menu) override; + void contextMenu(Menu* menu) override; }; struct SwitchMatrixModule : MatrixModule { @@ -116,7 +116,7 @@ struct SwitchMatrixModuleWidget : MatrixBaseModuleWidget { addParam(s); } - void appendContextMenu(Menu* menu) override; + void contextMenu(Menu* menu) override; }; } // namespace bogaudio diff --git a/src/mixer.cpp b/src/mixer.cpp @@ -53,7 +53,7 @@ void DimmableMixerModule::fromJson(json_t* root) { } -void DimmableMixerWidget::appendContextMenu(Menu* menu) { +void DimmableMixerWidget::contextMenu(Menu* menu) { auto m = dynamic_cast<DimmableMixerModule*>(module); assert(m); menu->addChild(new MenuLabel()); diff --git a/src/mixer.hpp b/src/mixer.hpp @@ -55,8 +55,8 @@ struct DimmableMixerModule : BGModule { void fromJson(json_t* root) override; }; -struct DimmableMixerWidget : ModuleWidget { - void appendContextMenu(Menu* menu) override; +struct DimmableMixerWidget : BGModuleWidget { + void contextMenu(Menu* menu) override; }; struct MuteButton : ToggleButton { diff --git a/src/module.cpp b/src/module.cpp @@ -68,3 +68,8 @@ void BGModule::process(const ProcessArgs& args) { } postProcessAlways(args); } + + +void BGModuleWidget::appendContextMenu(Menu* menu) { + contextMenu(menu); +} diff --git a/src/module.hpp b/src/module.hpp @@ -47,4 +47,10 @@ struct BGModule : Module { virtual void postProcessAlways(const ProcessArgs& args) {} // modulate() may not have been called. }; +struct BGModuleWidget : ModuleWidget { + void appendContextMenu(Menu* menu) override; + + virtual void contextMenu(Menu* menu) {} +}; + } // namespace bogaudio diff --git a/src/template_panels.cpp b/src/template_panels.cpp @@ -1,7 +1,7 @@ #include "template_panels.hpp" -struct ThreeHPWidget : ModuleWidget { +struct ThreeHPWidget : BGModuleWidget { ThreeHPWidget(Module* module) { setModule(module); box.size = Vec(RACK_GRID_WIDTH * 3, RACK_GRID_HEIGHT); @@ -21,7 +21,7 @@ struct ThreeHPWidget : ModuleWidget { Model* modelThreeHP = bogaudio::createModel<Module, ThreeHPWidget>("Bogaudio-ThreeHP", "THREEHP", "Template/blank", "Blank"); -struct FiveHPWidget : ModuleWidget { +struct FiveHPWidget : BGModuleWidget { FiveHPWidget(Module* module) { setModule(module); box.size = Vec(RACK_GRID_WIDTH * 5, RACK_GRID_HEIGHT); @@ -41,7 +41,7 @@ struct FiveHPWidget : ModuleWidget { Model* modelFiveHP = bogaudio::createModel<Module, FiveHPWidget>("Bogaudio-FiveHP", "FIVEHP", "Template/blank", "Blank"); -struct SixHPWidget : ModuleWidget { +struct SixHPWidget : BGModuleWidget { SixHPWidget(Module* module) { setModule(module); box.size = Vec(RACK_GRID_WIDTH * 6, RACK_GRID_HEIGHT); @@ -61,7 +61,7 @@ struct SixHPWidget : ModuleWidget { Model* modelSixHP = bogaudio::createModel<Module, SixHPWidget>("Bogaudio-SixHP", "SIXHP", "Template/blank", "Blank"); -struct EightHPWidget : ModuleWidget { +struct EightHPWidget : BGModuleWidget { EightHPWidget(Module* module) { setModule(module); box.size = Vec(RACK_GRID_WIDTH * 8, RACK_GRID_HEIGHT); @@ -81,7 +81,7 @@ struct EightHPWidget : ModuleWidget { Model* modelEightHP = bogaudio::createModel<Module, EightHPWidget>("Bogaudio-EightHP", "EIGHTHP", "Template/blank", "Blank"); -struct TenHPWidget : ModuleWidget { +struct TenHPWidget : BGModuleWidget { TenHPWidget(Module* module) { setModule(module); box.size = Vec(RACK_GRID_WIDTH * 10, RACK_GRID_HEIGHT); @@ -103,7 +103,7 @@ struct TenHPWidget : ModuleWidget { Model* modelTenHP = bogaudio::createModel<Module, TenHPWidget>("Bogaudio-TenHP", "TENHP", "Template/blank", "Blank"); -struct TwelveHPWidget : ModuleWidget { +struct TwelveHPWidget : BGModuleWidget { TwelveHPWidget(Module* module) { setModule(module); box.size = Vec(RACK_GRID_WIDTH * 12, RACK_GRID_HEIGHT); @@ -125,7 +125,7 @@ struct TwelveHPWidget : ModuleWidget { Model* modelTwelveHP = bogaudio::createModel<Module, TwelveHPWidget>("Bogaudio-TwelveHP", "TWELVEHP", "Template/blank", "Blank"); -struct ThirteenHPWidget : ModuleWidget { +struct ThirteenHPWidget : BGModuleWidget { ThirteenHPWidget(Module* module) { setModule(module); box.size = Vec(RACK_GRID_WIDTH * 13, RACK_GRID_HEIGHT); @@ -147,7 +147,7 @@ struct ThirteenHPWidget : ModuleWidget { Model* modelThirteenHP = bogaudio::createModel<Module, ThirteenHPWidget>("Bogaudio-ThirteenHP", "THIRTEENHP", "Template/blank", "Blank"); -struct FifteenHPWidget : ModuleWidget { +struct FifteenHPWidget : BGModuleWidget { FifteenHPWidget(Module* module) { setModule(module); box.size = Vec(RACK_GRID_WIDTH * 15, RACK_GRID_HEIGHT); @@ -169,7 +169,7 @@ struct FifteenHPWidget : ModuleWidget { Model* modelFifteenHP = bogaudio::createModel<Module, FifteenHPWidget>("Bogaudio-FifteenHP", "FIFTEENHP", "Template/blank", "Blank"); -struct SixteenHPWidget : ModuleWidget { +struct SixteenHPWidget : BGModuleWidget { SixteenHPWidget(Module* module) { setModule(module); box.size = Vec(RACK_GRID_WIDTH * 16, RACK_GRID_HEIGHT); @@ -191,7 +191,7 @@ struct SixteenHPWidget : ModuleWidget { Model* modelSixteenHP = bogaudio::createModel<Module, SixteenHPWidget>("Bogaudio-SixteenHP", "SIXTEENHP", "Template/blank", "Blank"); -struct EighteenHPWidget : ModuleWidget { +struct EighteenHPWidget : BGModuleWidget { EighteenHPWidget(Module* module) { setModule(module); box.size = Vec(RACK_GRID_WIDTH * 18, RACK_GRID_HEIGHT); @@ -213,7 +213,7 @@ struct EighteenHPWidget : ModuleWidget { Model* modelEighteenHP = bogaudio::createModel<Module, EighteenHPWidget>("Bogaudio-EighteenHP", "EIGHTEENHP", "Template/blank", "Blank"); -struct TwentyHPWidget : ModuleWidget { +struct TwentyHPWidget : BGModuleWidget { TwentyHPWidget(Module* module) { setModule(module); box.size = Vec(RACK_GRID_WIDTH * 20, RACK_GRID_HEIGHT); @@ -235,7 +235,7 @@ struct TwentyHPWidget : ModuleWidget { Model* modelTwentyHP = bogaudio::createModel<Module, TwentyHPWidget>("Bogaudio-TwentyHP", "TWENTYHP", "Template/blank", "Blank"); -struct TwentyTwoHPWidget : ModuleWidget { +struct TwentyTwoHPWidget : BGModuleWidget { TwentyTwoHPWidget(Module* module) { setModule(module); box.size = Vec(RACK_GRID_WIDTH * 22, RACK_GRID_HEIGHT); @@ -257,7 +257,7 @@ struct TwentyTwoHPWidget : ModuleWidget { Model* modelTwentyTwoHP = bogaudio::createModel<Module, TwentyTwoHPWidget>("Bogaudio-TwentyTwoHP", "TWENTYTWOHP", "Template/blank", "Blank"); -struct TwentyFiveHPWidget : ModuleWidget { +struct TwentyFiveHPWidget : BGModuleWidget { TwentyFiveHPWidget(Module* module) { setModule(module); box.size = Vec(RACK_GRID_WIDTH * 25, RACK_GRID_HEIGHT); @@ -279,7 +279,7 @@ struct TwentyFiveHPWidget : ModuleWidget { Model* modelTwentyFiveHP = bogaudio::createModel<Module, TwentyFiveHPWidget>("Bogaudio-TwentyFiveHP", "TWENTYFIVEHP", "Template/blank", "Blank"); -struct ThirtyHPWidget : ModuleWidget { +struct ThirtyHPWidget : BGModuleWidget { ThirtyHPWidget(Module* module) { setModule(module); box.size = Vec(RACK_GRID_WIDTH * 30, RACK_GRID_HEIGHT); diff --git a/src/trigger_on_load.cpp b/src/trigger_on_load.cpp @@ -24,7 +24,7 @@ void TriggerOnLoadModule::fromJson(json_t* root) { } -void TriggerOnLoadModuleWidget::appendContextMenu(Menu* menu) { +void TriggerOnLoadModuleWidget::contextMenu(Menu* menu) { auto m = dynamic_cast<TriggerOnLoadModule*>(module); assert(m); menu->addChild(new MenuLabel()); diff --git a/src/trigger_on_load.hpp b/src/trigger_on_load.hpp @@ -16,14 +16,14 @@ struct TriggerOnLoadModule : BGModule { virtual bool shouldTriggerOnNextLoad() = 0; }; -struct TriggerOnLoadModuleWidget : ModuleWidget { +struct TriggerOnLoadModuleWidget : BGModuleWidget { std::string _menuItemLabel; TriggerOnLoadModuleWidget(const char* menuItemLabel = "Resume loop on load") : _menuItemLabel(menuItemLabel) {} - void appendContextMenu(Menu* menu) override; + void contextMenu(Menu* menu) override; }; } // namespace bogaudio