commit 31030511cda2e947cb015319e35163388d04bfc1
parent 4f3d7803e3171e98f3163b29a71fc6a6c51bcb63
Author: Matt Demanett <matt@demanett.net>
Date: Sun, 24 Dec 2017 15:25:54 -0600
Custom port widget.
Diffstat:
13 files changed, 85 insertions(+), 77 deletions(-)
diff --git a/res/port-src.svg b/res/port-src.svg
Binary files differ.
diff --git a/res/port.svg b/res/port.svg
Binary files differ.
diff --git a/scripts/svg_widgets.rb b/scripts/svg_widgets.rb
@@ -63,8 +63,8 @@ options = {
manufacturer: 'MANUFACTURER',
hp: '10',
param_class: 'RoundBlackKnob',
- input_class: 'PJ301MPort',
- output_class: 'PJ301MPort',
+ input_class: 'Port24',
+ output_class: 'Port24',
light_class: 'TinyLight<GreenLight>',
comments: false,
sort: nil
diff --git a/src/Analyzer.cpp b/src/Analyzer.cpp
@@ -566,15 +566,15 @@ AnalyzerWidget::AnalyzerWidget() {
addParam(createParam<Button9Toggle2>(qualityParamPosition, module, Analyzer::QUALITY_PARAM, 1.0, 2.0, 1.0));
addParam(createParam<Button9Toggle2>(powerParamPosition, module, Analyzer::POWER_PARAM, 0.0, 1.0, 1.0));
- addInput(createInput<PJ301MPort>(signalaInputPosition, module, Analyzer::SIGNALA_INPUT));
- addInput(createInput<PJ301MPort>(signalbInputPosition, module, Analyzer::SIGNALB_INPUT));
- addInput(createInput<PJ301MPort>(signalcInputPosition, module, Analyzer::SIGNALC_INPUT));
- addInput(createInput<PJ301MPort>(signaldInputPosition, module, Analyzer::SIGNALD_INPUT));
-
- addOutput(createOutput<PJ301MPort>(signalaOutputPosition, module, Analyzer::SIGNALA_OUTPUT));
- addOutput(createOutput<PJ301MPort>(signalbOutputPosition, module, Analyzer::SIGNALB_OUTPUT));
- addOutput(createOutput<PJ301MPort>(signalcOutputPosition, module, Analyzer::SIGNALC_OUTPUT));
- addOutput(createOutput<PJ301MPort>(signaldOutputPosition, module, Analyzer::SIGNALD_OUTPUT));
+ addInput(createInput<Port24>(signalaInputPosition, module, Analyzer::SIGNALA_INPUT));
+ addInput(createInput<Port24>(signalbInputPosition, module, Analyzer::SIGNALB_INPUT));
+ addInput(createInput<Port24>(signalcInputPosition, module, Analyzer::SIGNALC_INPUT));
+ addInput(createInput<Port24>(signaldInputPosition, module, Analyzer::SIGNALD_INPUT));
+
+ addOutput(createOutput<Port24>(signalaOutputPosition, module, Analyzer::SIGNALA_OUTPUT));
+ addOutput(createOutput<Port24>(signalbOutputPosition, module, Analyzer::SIGNALB_OUTPUT));
+ addOutput(createOutput<Port24>(signalcOutputPosition, module, Analyzer::SIGNALC_OUTPUT));
+ addOutput(createOutput<Port24>(signaldOutputPosition, module, Analyzer::SIGNALD_OUTPUT));
addChild(createLight<TinyLight<GreenLight>>(qualityHighLightPosition, module, Analyzer::QUALITY_HIGH_LIGHT));
addChild(createLight<TinyLight<GreenLight>>(qualityGoodLightPosition, module, Analyzer::QUALITY_GOOD_LIGHT));
diff --git a/src/BogaudioModules.hpp b/src/BogaudioModules.hpp
@@ -79,3 +79,11 @@ struct Button9Toggle3 : SVGSwitch, ToggleSwitch {
box.size = Vec(9, 9);
}
};
+
+struct Port24 : SVGPort {
+ Port24() {
+ background->svg = SVG::load(assetPlugin(plugin, "res/port.svg"));
+ background->wrap();
+ box.size = Vec(24, 24);
+ }
+};
diff --git a/src/DADSRH.cpp b/src/DADSRH.cpp
@@ -189,11 +189,11 @@ DADSRHWidget::DADSRHWidget() {
addParam(createParam<CKSS>(speedParamPosition, module, DADSRH::SPEED_PARAM, 0.0, 1.0, 1.0));
addParam(createParam<CKSS>(retriggerParamPosition, module, DADSRH::RETRIGGER_PARAM, 0.0, 1.0, 1.0));
- addInput(createInput<PJ301MPort>(triggerInputPosition, module, DADSRH::TRIGGER_INPUT));
+ addInput(createInput<Port24>(triggerInputPosition, module, DADSRH::TRIGGER_INPUT));
- addOutput(createOutput<PJ301MPort>(envOutputPosition, module, DADSRH::ENV_OUTPUT));
- addOutput(createOutput<PJ301MPort>(invOutputPosition, module, DADSRH::INV_OUTPUT));
- addOutput(createOutput<PJ301MPort>(triggerOutputPosition, module, DADSRH::TRIGGER_OUTPUT));
+ addOutput(createOutput<Port24>(envOutputPosition, module, DADSRH::ENV_OUTPUT));
+ addOutput(createOutput<Port24>(invOutputPosition, module, DADSRH::INV_OUTPUT));
+ addOutput(createOutput<Port24>(triggerOutputPosition, module, DADSRH::TRIGGER_OUTPUT));
addChild(createLight<TinyLight<GreenLight>>(delayLightPosition, module, DADSRH::DELAY_LIGHT));
addChild(createLight<TinyLight<GreenLight>>(attackLightPosition, module, DADSRH::ATTACK_LIGHT));
diff --git a/src/DADSRHPlus.cpp b/src/DADSRHPlus.cpp
@@ -210,22 +210,22 @@ DADSRHPlusWidget::DADSRHPlusWidget() {
addParam(createParam<CKSS>(speedParamPosition, module, DADSRHPlus::SPEED_PARAM, 0.0, 1.0, 1.0));
addParam(createParam<CKSS>(retriggerParamPosition, module, DADSRHPlus::RETRIGGER_PARAM, 0.0, 1.0, 1.0));
- addInput(createInput<PJ301MPort>(delayInputPosition, module, DADSRHPlus::DELAY_INPUT));
- addInput(createInput<PJ301MPort>(attackInputPosition, module, DADSRHPlus::ATTACK_INPUT));
- addInput(createInput<PJ301MPort>(decayInputPosition, module, DADSRHPlus::DECAY_INPUT));
- addInput(createInput<PJ301MPort>(sustainInputPosition, module, DADSRHPlus::SUSTAIN_INPUT));
- addInput(createInput<PJ301MPort>(releaseInputPosition, module, DADSRHPlus::RELEASE_INPUT));
- addInput(createInput<PJ301MPort>(holdInputPosition, module, DADSRHPlus::HOLD_INPUT));
- addInput(createInput<PJ301MPort>(triggerInputPosition, module, DADSRHPlus::TRIGGER_INPUT));
-
- addOutput(createOutput<PJ301MPort>(delayOutputPosition, module, DADSRHPlus::DELAY_OUTPUT));
- addOutput(createOutput<PJ301MPort>(attackOutputPosition, module, DADSRHPlus::ATTACK_OUTPUT));
- addOutput(createOutput<PJ301MPort>(decayOutputPosition, module, DADSRHPlus::DECAY_OUTPUT));
- addOutput(createOutput<PJ301MPort>(sustainOutputPosition, module, DADSRHPlus::SUSTAIN_OUTPUT));
- addOutput(createOutput<PJ301MPort>(releaseOutputPosition, module, DADSRHPlus::RELEASE_OUTPUT));
- addOutput(createOutput<PJ301MPort>(envOutputPosition, module, DADSRHPlus::ENV_OUTPUT));
- addOutput(createOutput<PJ301MPort>(invOutputPosition, module, DADSRHPlus::INV_OUTPUT));
- addOutput(createOutput<PJ301MPort>(triggerOutputPosition, module, DADSRHPlus::TRIGGER_OUTPUT));
+ addInput(createInput<Port24>(delayInputPosition, module, DADSRHPlus::DELAY_INPUT));
+ addInput(createInput<Port24>(attackInputPosition, module, DADSRHPlus::ATTACK_INPUT));
+ addInput(createInput<Port24>(decayInputPosition, module, DADSRHPlus::DECAY_INPUT));
+ addInput(createInput<Port24>(sustainInputPosition, module, DADSRHPlus::SUSTAIN_INPUT));
+ addInput(createInput<Port24>(releaseInputPosition, module, DADSRHPlus::RELEASE_INPUT));
+ addInput(createInput<Port24>(holdInputPosition, module, DADSRHPlus::HOLD_INPUT));
+ addInput(createInput<Port24>(triggerInputPosition, module, DADSRHPlus::TRIGGER_INPUT));
+
+ addOutput(createOutput<Port24>(delayOutputPosition, module, DADSRHPlus::DELAY_OUTPUT));
+ addOutput(createOutput<Port24>(attackOutputPosition, module, DADSRHPlus::ATTACK_OUTPUT));
+ addOutput(createOutput<Port24>(decayOutputPosition, module, DADSRHPlus::DECAY_OUTPUT));
+ addOutput(createOutput<Port24>(sustainOutputPosition, module, DADSRHPlus::SUSTAIN_OUTPUT));
+ addOutput(createOutput<Port24>(releaseOutputPosition, module, DADSRHPlus::RELEASE_OUTPUT));
+ addOutput(createOutput<Port24>(envOutputPosition, module, DADSRHPlus::ENV_OUTPUT));
+ addOutput(createOutput<Port24>(invOutputPosition, module, DADSRHPlus::INV_OUTPUT));
+ addOutput(createOutput<Port24>(triggerOutputPosition, module, DADSRHPlus::TRIGGER_OUTPUT));
addChild(createLight<TinyLight<GreenLight>>(delayLightPosition, module, DADSRHPlus::DELAY_LIGHT));
addChild(createLight<TinyLight<GreenLight>>(attackLightPosition, module, DADSRHPlus::ATTACK_LIGHT));
diff --git a/src/Manual.cpp b/src/Manual.cpp
@@ -86,12 +86,12 @@ ManualWidget::ManualWidget() {
addParam(createParam<Button18>(triggerParamPosition, module, Manual::TRIGGER_PARAM, 0.0, 1.0, 0.0));
- addOutput(createOutput<PJ301MPort>(out1OutputPosition, module, Manual::OUT1_OUTPUT));
- addOutput(createOutput<PJ301MPort>(out2OutputPosition, module, Manual::OUT2_OUTPUT));
- addOutput(createOutput<PJ301MPort>(out3OutputPosition, module, Manual::OUT3_OUTPUT));
- addOutput(createOutput<PJ301MPort>(out4OutputPosition, module, Manual::OUT4_OUTPUT));
- addOutput(createOutput<PJ301MPort>(out5OutputPosition, module, Manual::OUT5_OUTPUT));
- addOutput(createOutput<PJ301MPort>(out6OutputPosition, module, Manual::OUT6_OUTPUT));
- addOutput(createOutput<PJ301MPort>(out7OutputPosition, module, Manual::OUT7_OUTPUT));
- addOutput(createOutput<PJ301MPort>(out8OutputPosition, module, Manual::OUT8_OUTPUT));
+ addOutput(createOutput<Port24>(out1OutputPosition, module, Manual::OUT1_OUTPUT));
+ addOutput(createOutput<Port24>(out2OutputPosition, module, Manual::OUT2_OUTPUT));
+ addOutput(createOutput<Port24>(out3OutputPosition, module, Manual::OUT3_OUTPUT));
+ addOutput(createOutput<Port24>(out4OutputPosition, module, Manual::OUT4_OUTPUT));
+ addOutput(createOutput<Port24>(out5OutputPosition, module, Manual::OUT5_OUTPUT));
+ addOutput(createOutput<Port24>(out6OutputPosition, module, Manual::OUT6_OUTPUT));
+ addOutput(createOutput<Port24>(out7OutputPosition, module, Manual::OUT7_OUTPUT));
+ addOutput(createOutput<Port24>(out8OutputPosition, module, Manual::OUT8_OUTPUT));
}
diff --git a/src/Noise.cpp b/src/Noise.cpp
@@ -87,11 +87,11 @@ NoiseWidget::NoiseWidget() {
auto absOutputPosition = Vec(10.5, 281.0);
// end generated by svg_widgets.rb
- addInput(createInput<PJ301MPort>(absInputPosition, module, Noise::ABS_INPUT));
+ addInput(createInput<Port24>(absInputPosition, module, Noise::ABS_INPUT));
- addOutput(createOutput<PJ301MPort>(whiteOutputPosition, module, Noise::WHITE_OUTPUT));
- addOutput(createOutput<PJ301MPort>(pinkOutputPosition, module, Noise::PINK_OUTPUT));
- addOutput(createOutput<PJ301MPort>(redOutputPosition, module, Noise::RED_OUTPUT));
- addOutput(createOutput<PJ301MPort>(gaussOutputPosition, module, Noise::GAUSS_OUTPUT));
- addOutput(createOutput<PJ301MPort>(absOutputPosition, module, Noise::ABS_OUTPUT));
+ addOutput(createOutput<Port24>(whiteOutputPosition, module, Noise::WHITE_OUTPUT));
+ addOutput(createOutput<Port24>(pinkOutputPosition, module, Noise::PINK_OUTPUT));
+ addOutput(createOutput<Port24>(redOutputPosition, module, Noise::RED_OUTPUT));
+ addOutput(createOutput<Port24>(gaussOutputPosition, module, Noise::GAUSS_OUTPUT));
+ addOutput(createOutput<Port24>(absOutputPosition, module, Noise::ABS_OUTPUT));
}
diff --git a/src/Offset.cpp b/src/Offset.cpp
@@ -79,9 +79,9 @@ OffsetWidget::OffsetWidget() {
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(createInput<PJ301MPort>(offsetInputPosition, module, Offset::OFFSET_INPUT));
- addInput(createInput<PJ301MPort>(scaleInputPosition, module, Offset::SCALE_INPUT));
- addInput(createInput<PJ301MPort>(inInputPosition, module, Offset::IN_INPUT));
+ addInput(createInput<Port24>(offsetInputPosition, module, Offset::OFFSET_INPUT));
+ addInput(createInput<Port24>(scaleInputPosition, module, Offset::SCALE_INPUT));
+ addInput(createInput<Port24>(inInputPosition, module, Offset::IN_INPUT));
- addOutput(createOutput<PJ301MPort>(outOutputPosition, module, Offset::OUT_OUTPUT));
+ addOutput(createOutput<Port24>(outOutputPosition, module, Offset::OUT_OUTPUT));
}
diff --git a/src/SampleHold.cpp b/src/SampleHold.cpp
@@ -123,11 +123,11 @@ SampleHoldWidget::SampleHoldWidget() {
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));
- addInput(createInput<PJ301MPort>(trigger1InputPosition, module, SampleHold::TRIGGER1_INPUT));
- addInput(createInput<PJ301MPort>(in1InputPosition, module, SampleHold::IN1_INPUT));
- addInput(createInput<PJ301MPort>(trigger2InputPosition, module, SampleHold::TRIGGER2_INPUT));
- addInput(createInput<PJ301MPort>(in2InputPosition, module, SampleHold::IN2_INPUT));
+ addInput(createInput<Port24>(trigger1InputPosition, module, SampleHold::TRIGGER1_INPUT));
+ addInput(createInput<Port24>(in1InputPosition, module, SampleHold::IN1_INPUT));
+ addInput(createInput<Port24>(trigger2InputPosition, module, SampleHold::TRIGGER2_INPUT));
+ addInput(createInput<Port24>(in2InputPosition, module, SampleHold::IN2_INPUT));
- addOutput(createOutput<PJ301MPort>(out1OutputPosition, module, SampleHold::OUT1_OUTPUT));
- addOutput(createOutput<PJ301MPort>(out2OutputPosition, module, SampleHold::OUT2_OUTPUT));
+ addOutput(createOutput<Port24>(out1OutputPosition, module, SampleHold::OUT1_OUTPUT));
+ addOutput(createOutput<Port24>(out2OutputPosition, module, SampleHold::OUT2_OUTPUT));
}
diff --git a/src/Shaper.cpp b/src/Shaper.cpp
@@ -142,17 +142,17 @@ ShaperWidget::ShaperWidget() {
addParam(createParam<Knob38>(signalParamPosition, module, Shaper::SIGNAL_PARAM, 0.0, 1.0, 0.5));
addParam(createParam<Button18>(triggerParamPosition, module, Shaper::TRIGGER_PARAM, 0.0, 1.0, 0.0));
- addInput(createInput<PJ301MPort>(triggerInputPosition, module, Shaper::TRIGGER_INPUT));
+ addInput(createInput<Port24>(triggerInputPosition, module, Shaper::TRIGGER_INPUT));
addParam(createParam<CKSS>(speedParamPosition, module, Shaper::SPEED_PARAM, 0.0, 1.0, 1.0));
addParam(createParam<CKSS>(loopParamPosition, module, Shaper::LOOP_PARAM, 0.0, 1.0, 1.0));
- addOutput(createOutput<PJ301MPort>(triggerOutputPosition, module, Shaper::TRIGGER_OUTPUT));
+ addOutput(createOutput<Port24>(triggerOutputPosition, module, Shaper::TRIGGER_OUTPUT));
- addOutput(createOutput<PJ301MPort>(envOutputPosition, module, Shaper::ENV_OUTPUT));
- addOutput(createOutput<PJ301MPort>(invOutputPosition, module, Shaper::INV_OUTPUT));
+ addOutput(createOutput<Port24>(envOutputPosition, module, Shaper::ENV_OUTPUT));
+ addOutput(createOutput<Port24>(invOutputPosition, module, Shaper::INV_OUTPUT));
- addInput(createInput<PJ301MPort>(signalInputPosition, module, Shaper::SIGNAL_INPUT));
- addOutput(createOutput<PJ301MPort>(signalOutputPosition, module, Shaper::SIGNAL_OUTPUT));
+ addInput(createInput<Port24>(signalInputPosition, module, Shaper::SIGNAL_INPUT));
+ addOutput(createOutput<Port24>(signalOutputPosition, module, Shaper::SIGNAL_OUTPUT));
addChild(createLight<TinyLight<GreenLight>>(attackLightPosition, module, Shaper::ATTACK_LIGHT));
addChild(createLight<TinyLight<GreenLight>>(onLightPosition, module, Shaper::ON_LIGHT));
diff --git a/src/ShaperPlus.cpp b/src/ShaperPlus.cpp
@@ -158,29 +158,29 @@ ShaperPlusWidget::ShaperPlusWidget() {
addParam(createParam<Knob38>(signalParamPosition, module, ShaperPlus::SIGNAL_PARAM, 0.0, 1.0, 0.5));
addParam(createParam<Button18>(triggerParamPosition, module, ShaperPlus::TRIGGER_PARAM, 0.0, 1.0, 0.0));
- addInput(createInput<PJ301MPort>(triggerInputPosition, module, ShaperPlus::TRIGGER_INPUT));
+ addInput(createInput<Port24>(triggerInputPosition, module, ShaperPlus::TRIGGER_INPUT));
addParam(createParam<CKSS>(speedParamPosition, module, ShaperPlus::SPEED_PARAM, 0.0, 1.0, 1.0));
addParam(createParam<CKSS>(loopParamPosition, module, ShaperPlus::LOOP_PARAM, 0.0, 1.0, 1.0));
- addOutput(createOutput<PJ301MPort>(triggerOutputPosition, module, ShaperPlus::TRIGGER_OUTPUT));
+ addOutput(createOutput<Port24>(triggerOutputPosition, module, ShaperPlus::TRIGGER_OUTPUT));
- addOutput(createOutput<PJ301MPort>(envOutputPosition, module, ShaperPlus::ENV_OUTPUT));
- addOutput(createOutput<PJ301MPort>(invOutputPosition, module, ShaperPlus::INV_OUTPUT));
+ addOutput(createOutput<Port24>(envOutputPosition, module, ShaperPlus::ENV_OUTPUT));
+ addOutput(createOutput<Port24>(invOutputPosition, module, ShaperPlus::INV_OUTPUT));
- addInput(createInput<PJ301MPort>(signalInputPosition, module, ShaperPlus::SIGNAL_INPUT));
- addOutput(createOutput<PJ301MPort>(signalOutputPosition, module, ShaperPlus::SIGNAL_OUTPUT));
+ addInput(createInput<Port24>(signalInputPosition, module, ShaperPlus::SIGNAL_INPUT));
+ addOutput(createOutput<Port24>(signalOutputPosition, module, ShaperPlus::SIGNAL_OUTPUT));
- addInput(createInput<PJ301MPort>(attackInputPosition, module, ShaperPlus::ATTACK_INPUT));
- addInput(createInput<PJ301MPort>(onInputPosition, module, ShaperPlus::ON_INPUT));
- addInput(createInput<PJ301MPort>(decayInputPosition, module, ShaperPlus::DECAY_INPUT));
- addInput(createInput<PJ301MPort>(offInputPosition, module, ShaperPlus::OFF_INPUT));
- addInput(createInput<PJ301MPort>(envInputPosition, module, ShaperPlus::ENV_INPUT));
- addInput(createInput<PJ301MPort>(signalcvInputPosition, module, ShaperPlus::SIGNALCV_INPUT));
+ addInput(createInput<Port24>(attackInputPosition, module, ShaperPlus::ATTACK_INPUT));
+ addInput(createInput<Port24>(onInputPosition, module, ShaperPlus::ON_INPUT));
+ addInput(createInput<Port24>(decayInputPosition, module, ShaperPlus::DECAY_INPUT));
+ addInput(createInput<Port24>(offInputPosition, module, ShaperPlus::OFF_INPUT));
+ addInput(createInput<Port24>(envInputPosition, module, ShaperPlus::ENV_INPUT));
+ addInput(createInput<Port24>(signalcvInputPosition, module, ShaperPlus::SIGNALCV_INPUT));
- addOutput(createOutput<PJ301MPort>(attackOutputPosition, module, ShaperPlus::ATTACK_OUTPUT));
- addOutput(createOutput<PJ301MPort>(onOutputPosition, module, ShaperPlus::ON_OUTPUT));
- addOutput(createOutput<PJ301MPort>(decayOutputPosition, module, ShaperPlus::DECAY_OUTPUT));
- addOutput(createOutput<PJ301MPort>(offOutputPosition, module, ShaperPlus::OFF_OUTPUT));
+ addOutput(createOutput<Port24>(attackOutputPosition, module, ShaperPlus::ATTACK_OUTPUT));
+ addOutput(createOutput<Port24>(onOutputPosition, module, ShaperPlus::ON_OUTPUT));
+ addOutput(createOutput<Port24>(decayOutputPosition, module, ShaperPlus::DECAY_OUTPUT));
+ addOutput(createOutput<Port24>(offOutputPosition, module, ShaperPlus::OFF_OUTPUT));
addChild(createLight<TinyLight<GreenLight>>(attackLightPosition, module, ShaperPlus::ATTACK_LIGHT));
addChild(createLight<TinyLight<GreenLight>>(onLightPosition, module, ShaperPlus::ON_LIGHT));
