From c0cafa33bdca9ab9016bee28c39cd9ac31301704 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Thu, 16 Apr 2020 07:22:42 -0400 Subject: [PATCH] Use MenuSeparator instead of MenuEntry for separating menu items. --- src/Braids.cpp | 2 +- src/Branches.cpp | 2 +- src/Clouds.cpp | 6 +++--- src/Elements.cpp | 2 +- src/Frames.cpp | 8 ++++---- src/Marbles.cpp | 6 +++--- src/Plaits.cpp | 8 ++++---- src/Rings.cpp | 4 ++-- src/Tides.cpp | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/Braids.cpp b/src/Braids.cpp index fc5b4d6..cfec776 100644 --- a/src/Braids.cpp +++ b/src/Braids.cpp @@ -336,7 +336,7 @@ struct BraidsWidget : ModuleWidget { Braids *braids = dynamic_cast(module); assert(braids); - menu->addChild(construct()); + menu->addChild(new MenuSeparator); menu->addChild(construct(&MenuLabel::text, "Options")); menu->addChild(construct(&MenuItem::text, "META", &BraidsSettingItem::setting, &braids->settings.meta_modulation)); menu->addChild(construct(&MenuItem::text, "DRFT", &BraidsSettingItem::setting, &braids->settings.vco_drift, &BraidsSettingItem::onValue, 4)); diff --git a/src/Branches.cpp b/src/Branches.cpp index 9b18b44..f69fda4 100644 --- a/src/Branches.cpp +++ b/src/Branches.cpp @@ -155,7 +155,7 @@ struct BranchesWidget : ModuleWidget { } }; - menu->addChild(construct()); + menu->addChild(new MenuSeparator); menu->addChild(construct(&MenuLabel::text, "Channels")); menu->addChild(construct(&MenuItem::text, "Channel 1 modes", &BranchesModeItem::branches, branches, &BranchesModeItem::channel, 0)); diff --git a/src/Clouds.cpp b/src/Clouds.cpp index 729c925..4ef902a 100644 --- a/src/Clouds.cpp +++ b/src/Clouds.cpp @@ -380,21 +380,21 @@ struct CloudsWidget : ModuleWidget { Clouds *module = dynamic_cast(this->module); assert(module); - menu->addChild(construct()); + menu->addChild(new MenuSeparator); menu->addChild(construct(&MenuLabel::text, "Blend knob")); menu->addChild(construct(&MenuItem::text, "Wet/dry", &CloudsBlendItem::module, module, &CloudsBlendItem::blendMode, 0)); menu->addChild(construct(&MenuItem::text, "Spread", &CloudsBlendItem::module, module, &CloudsBlendItem::blendMode, 1)); menu->addChild(construct(&MenuItem::text, "Feedback", &CloudsBlendItem::module, module, &CloudsBlendItem::blendMode, 2)); menu->addChild(construct(&MenuItem::text, "Reverb", &CloudsBlendItem::module, module, &CloudsBlendItem::blendMode, 3)); - menu->addChild(construct()); + menu->addChild(new MenuSeparator); menu->addChild(construct(&MenuLabel::text, "Alternative mode")); menu->addChild(construct(&MenuItem::text, "Granular", &CloudsPlaybackItem::module, module, &CloudsPlaybackItem::playback, clouds::PLAYBACK_MODE_GRANULAR)); menu->addChild(construct(&MenuItem::text, "Pitch-shifter/time-stretcher", &CloudsPlaybackItem::module, module, &CloudsPlaybackItem::playback, clouds::PLAYBACK_MODE_STRETCH)); menu->addChild(construct(&MenuItem::text, "Looping delay", &CloudsPlaybackItem::module, module, &CloudsPlaybackItem::playback, clouds::PLAYBACK_MODE_LOOPING_DELAY)); menu->addChild(construct(&MenuItem::text, "Spectral madness", &CloudsPlaybackItem::module, module, &CloudsPlaybackItem::playback, clouds::PLAYBACK_MODE_SPECTRAL)); - menu->addChild(construct()); + menu->addChild(new MenuSeparator); menu->addChild(construct(&MenuLabel::text, "Quality")); menu->addChild(construct(&MenuItem::text, "1s 32kHz 16-bit stereo", &CloudsQualityItem::module, module, &CloudsQualityItem::quality, 0)); menu->addChild(construct(&MenuItem::text, "2s 32kHz 16-bit mono", &CloudsQualityItem::module, module, &CloudsQualityItem::quality, 1)); diff --git a/src/Elements.cpp b/src/Elements.cpp index 7241ab9..1e600ab 100644 --- a/src/Elements.cpp +++ b/src/Elements.cpp @@ -330,7 +330,7 @@ struct ElementsWidget : ModuleWidget { Elements *elements = dynamic_cast(module); assert(elements); - menu->addChild(construct()); + menu->addChild(new MenuSeparator); menu->addChild(construct(&MenuLabel::text, "Alternative models")); menu->addChild(construct(&MenuItem::text, "Original", &ElementsModalItem::elements, elements, &ElementsModalItem::model, 0)); menu->addChild(construct(&MenuItem::text, "Non-linear string", &ElementsModalItem::elements, elements, &ElementsModalItem::model, 1)); diff --git a/src/Frames.cpp b/src/Frames.cpp index fb06c17..70260d2 100644 --- a/src/Frames.cpp +++ b/src/Frames.cpp @@ -372,7 +372,7 @@ struct FramesWidget : ModuleWidget { Menu *menu = new Menu(); menu->addChild(construct(&MenuLabel::text, string::f("Channel %d", channel + 1))); - menu->addChild(construct()); + menu->addChild(new MenuSeparator); menu->addChild(construct(&MenuLabel::text, "Interpolation Curve")); menu->addChild(construct(&MenuItem::text, "Step", &FramesCurveItem::frames, frames, &FramesCurveItem::channel, channel, &FramesCurveItem::curve, frames::EASING_CURVE_STEP)); @@ -381,7 +381,7 @@ struct FramesWidget : ModuleWidget { menu->addChild(construct(&MenuItem::text, "Decelerating", &FramesCurveItem::frames, frames, &FramesCurveItem::channel, channel, &FramesCurveItem::curve, frames::EASING_CURVE_OUT_QUARTIC)); menu->addChild(construct(&MenuItem::text, "Smooth Departure/Arrival", &FramesCurveItem::frames, frames, &FramesCurveItem::channel, channel, &FramesCurveItem::curve, frames::EASING_CURVE_SINE)); menu->addChild(construct(&MenuItem::text, "Bouncing", &FramesCurveItem::frames, frames, &FramesCurveItem::channel, channel, &FramesCurveItem::curve, frames::EASING_CURVE_BOUNCE)); - menu->addChild(construct()); + menu->addChild(new MenuSeparator); menu->addChild(construct(&MenuLabel::text, "Response Curve")); menu->addChild(construct(&MenuItem::text, "Linear", &FramesResponseItem::frames, frames, &FramesResponseItem::channel, channel, &FramesResponseItem::response, 0)); menu->addChild(construct(&MenuItem::text, "Exponential", &FramesResponseItem::frames, frames, &FramesResponseItem::channel, channel, &FramesResponseItem::response, 255)); @@ -409,14 +409,14 @@ struct FramesWidget : ModuleWidget { } }; - menu->addChild(construct()); + menu->addChild(new MenuSeparator); menu->addChild(construct(&MenuLabel::text, "Channel Settings")); for (int i = 0; i < 4; i++) { menu->addChild(construct(&MenuItem::text, string::f("Channel %d", i + 1), &FramesChannelSettingsItem::frames, frames, &FramesChannelSettingsItem::channel, i)); } menu->addChild(construct(&MenuItem::text, "Clear Keyframes", &FramesClearItem::frames, frames)); - menu->addChild(construct()); + menu->addChild(new MenuSeparator); menu->addChild(construct(&MenuLabel::text, "Mode")); menu->addChild(construct(&MenuItem::text, "Keyframer", &FramesModeItem::frames, frames, &FramesModeItem::poly_lfo_mode, false)); menu->addChild(construct(&MenuItem::text, "Poly LFO", &FramesModeItem::frames, frames, &FramesModeItem::poly_lfo_mode, true)); diff --git a/src/Marbles.cpp b/src/Marbles.cpp index 19ff30c..28a486b 100644 --- a/src/Marbles.cpp +++ b/src/Marbles.cpp @@ -596,7 +596,7 @@ struct MarblesWidget : ModuleWidget { } }; - menu->addChild(new MenuEntry); + menu->addChild(new MenuSeparator); menu->addChild(createMenuLabel("Scales")); const std::string scaleLabels[] = { "Major", @@ -621,7 +621,7 @@ struct MarblesWidget : ModuleWidget { } }; - menu->addChild(new MenuEntry); + menu->addChild(new MenuSeparator); menu->addChild(createMenuLabel("Internal X clock source")); const std::string sourceLabels[] = { "T₁ → X₁, T₂ → X₂, T₃ → X₃", @@ -672,7 +672,7 @@ struct MarblesWidget : ModuleWidget { } }; - menu->addChild(new MenuEntry); + menu->addChild(new MenuSeparator); YDividerItem *yDividerItem = createMenuItem("Y divider ratio"); yDividerItem->module = module; menu->addChild(yDividerItem); diff --git a/src/Plaits.cpp b/src/Plaits.cpp index 8868af5..8c88ce8 100644 --- a/src/Plaits.cpp +++ b/src/Plaits.cpp @@ -53,8 +53,8 @@ struct Plaits : Module { bool lowCpu = false; bool lpg = false; - dsp::SchmittTrigger model1Trigger; - dsp::SchmittTrigger model2Trigger; + dsp::BooleanTrigger model1Trigger; + dsp::BooleanTrigger model2Trigger; Plaits() { config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS); @@ -307,7 +307,7 @@ struct PlaitsWidget : ModuleWidget { } }; - menu->addChild(new MenuEntry); + menu->addChild(new MenuSeparator); PlaitsLowCpuItem *lowCpuItem = createMenuItem("Low CPU", CHECKMARK(module->lowCpu)); lowCpuItem->module = module; menu->addChild(lowCpuItem); @@ -315,7 +315,7 @@ struct PlaitsWidget : ModuleWidget { lpgItem->module = module; menu->addChild(lpgItem); - menu->addChild(new MenuEntry()); + menu->addChild(new MenuSeparator); menu->addChild(createMenuLabel("Models")); for (int i = 0; i < 16; i++) { PlaitsModelItem *modelItem = createMenuItem(modelLabels[i], CHECKMARK(module->patch.engine == i)); diff --git a/src/Rings.cpp b/src/Rings.cpp index 5383316..67e3d06 100644 --- a/src/Rings.cpp +++ b/src/Rings.cpp @@ -316,7 +316,7 @@ struct RingsWidget : ModuleWidget { } }; - menu->addChild(construct()); + menu->addChild(new MenuSeparator); menu->addChild(construct(&MenuLabel::text, "Resonator")); menu->addChild(construct(&MenuItem::text, "Modal resonator", &RingsModelItem::rings, rings, &RingsModelItem::model, rings::RESONATOR_MODEL_MODAL)); menu->addChild(construct(&MenuItem::text, "Sympathetic strings", &RingsModelItem::rings, rings, &RingsModelItem::model, rings::RESONATOR_MODEL_SYMPATHETIC_STRING)); @@ -325,7 +325,7 @@ struct RingsWidget : ModuleWidget { menu->addChild(construct(&MenuItem::text, "Quantized sympathetic strings", &RingsModelItem::rings, rings, &RingsModelItem::model, rings::RESONATOR_MODEL_SYMPATHETIC_STRING_QUANTIZED)); menu->addChild(construct(&MenuItem::text, "Reverb string", &RingsModelItem::rings, rings, &RingsModelItem::model, rings::RESONATOR_MODEL_STRING_AND_REVERB)); - menu->addChild(construct()); + menu->addChild(new MenuSeparator); menu->addChild(construct(&MenuItem::text, "Disastrous Peace", &RingsEasterEggItem::rings, rings)); } }; diff --git a/src/Tides.cpp b/src/Tides.cpp index fd504a1..7830d8e 100644 --- a/src/Tides.cpp +++ b/src/Tides.cpp @@ -271,7 +271,7 @@ struct TidesWidget : ModuleWidget { } }; - menu->addChild(new MenuEntry); + menu->addChild(new MenuSeparator); SheepItem *sheepItem = createMenuItem("Sheep", CHECKMARK(module->sheep)); sheepItem->module = module; menu->addChild(sheepItem);