commit 4c9d6c319b0b27dfbd7c2163938f333eb9a43d39
parent bc6df44c7511bcc535ae0a212169fd82846718de
Author: Matt Demanett <matt@demanett.net>
Date: Wed, 17 Jan 2018 01:19:52 -0500
Detune: panel and stub.
Diffstat:
8 files changed, 312 insertions(+), 1 deletion(-)
diff --git a/res-src/Detune-src.svg b/res-src/Detune-src.svg
@@ -0,0 +1,184 @@
+<svg
+ version="1.1"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ width="45"
+ height="380"
+ viewBox="0 0 45 380"
+>
+ <style>
+ text {
+ fill: #333;
+ font-family: 'Roboto', sans-serif;
+ font-weight: bold;
+ }
+ text.title {
+ font-family: 'Comfortaa', sans-serif;
+ font-weight: normal;
+ }
+ text.brand {
+ font-family: 'Audiowide', sans-serif;
+ font-weight: bold;
+ }
+ </style>
+
+ <defs>
+ <symbol id="knob" viewBox="0 0 45px 45px">
+ <g transform="translate(22.5 22.5)">
+ <polyline points="-5,0 5,0" stroke-width="1" stroke="#00f" />
+ <polyline points="0,-5 0,5" stroke-width="1" stroke="#00f" />
+ <circle cx="0" cy="0" r="12.5" stroke-width="1" stroke="#00f" fill="none" />
+ </g>
+ </symbol>
+
+ <symbol id="knob-small" viewBox="0 0 45px 45px">
+ <g transform="translate(22.5 22.5)">
+ <polyline points="-3,0 3,0" stroke-width="1" stroke="#00f" />
+ <polyline points="0,-3 0,3" stroke-width="1" stroke="#00f" />
+ <circle cx="0" cy="0" r="7.5" stroke-width="1" stroke="#00f" fill="none" />
+ </g>
+ </symbol>
+
+ <symbol id="knobguide" viewBox="0 0 45px 45px">
+ <g transform="translate(22.5 22.5)">
+ <g transform="rotate(-240) translate(15 0)">
+ <text font-size="5.0pt" transform="translate(3 0) rotate(240) translate(-2.2 2.2)">0</text>
+ </g>
+ <g transform="rotate(-210) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-180) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-150) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-120) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-90) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-60) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-30) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(0) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(30) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(60) translate(15 0)">
+ <text font-size="5.0pt" transform="translate(3 0) rotate(-60) translate(-4 2.2)">10</text>
+ </g>
+ </g>
+ </symbol>
+
+ <symbol id="knobguide-multiple" viewBox="0 0 45px 45px">
+ <g transform="translate(22.5 22.5)">
+ <g transform="rotate(-180) translate(10 0)">
+ <text font-size="5.0pt" transform="translate(1 0) rotate(180) translate(-2.2 2.2)">1</text>
+ </g>
+ <g transform="rotate(-135) translate(10 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-90) translate(10 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-45) translate(10 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(0) translate(10 0)">
+ <text font-size="5.0pt" transform="translate(1.3 0) rotate(0) translate(-2.2 2.2)">5</text>
+ </g>
+ </g>
+ </symbol>
+
+ <symbol id="button" viewBox="0 0 9px 9px">
+ <g transform="translate(4.5 4.5)">
+ <circle cx="0" cy="0" r="4.1" stroke-width="1" stroke="#00f" fill="#f00" />
+ </g>
+ </symbol>
+
+ <symbol id="light" viewBox="0 0 1.1px 1.1px">
+ <rect width="3.2" height="3.2" fill="#0f0" />
+ </symbol>
+
+ <symbol id="input" viewBox="0 0 24px 24px">
+ <g transform="translate(12 12)">
+ <circle cx="0" cy="0" r="5" stroke-width="1" stroke="#0f0" fill="#0f0" />
+ <circle cx="0" cy="0" r="10.5" stroke-width="3" stroke="#0f0" fill="none" />
+ </g>
+ </symbol>
+
+ <symbol id="output" viewBox="0 0 24px 24px">
+ <g transform="translate(12 12)">
+ <circle cx="0" cy="0" r="5" stroke-width="1" stroke="#f00" fill="#f00" />
+ <circle cx="0" cy="0" r="10.5" stroke-width="3" stroke="#f00" fill="none" />
+ </g>
+ </symbol>
+ </defs>
+
+ <rect width="100%" height="100%" fill="#ddd" />
+ <polyline points="1,1 44,1 44,379 1,379 1,1" stroke="#e4e4e4" stroke-width="0.5" fill="none" />
+ <polyline points="0.5,0.5 44.5,0.5 44.5,379.5 0.5,379.5 0.5,0.5" stroke="#ebebeb" stroke-width="0.8" fill="none" />
+ <polyline points="0,0 45,0 45,380 0,380 0,0" stroke="#f2f2f2" stroke-width="1" fill="none" />
+
+ <!-- <polyline points="22.5,0 22.5,380" stroke-width="0.5" stroke="#0f0" /> -->
+ <!-- <rect width="45" height="7" fill="#0f0" transform="translate(0 63)" /> -->
+ <!-- <rect width="45" height="7" fill="#0f0" transform="translate(0 99)" /> -->
+ <!-- <rect width="45" height="7" fill="#0f0" transform="translate(0 159)" /> -->
+
+ <g transform="rotate(-90) translate(-376 13)">
+ <text class="title" font-size="7pt" letter-spacing="2.5px">DETUNE</text>
+ <g transform="translate(0 12)">
+ <text class="brand" font-size="7pt" letter-spacing="2px">BGA</text>
+ <rect width="3.0" height="3" fill="#ddd" transform="translate(11.5 -5)" />
+ </g>
+ </g>
+
+ <g transform="translate(0 25)">
+ <text font-size="6pt" letter-spacing="2px" transform="translate(5.5 0)">CENTS</text>
+ <use id="CENTS_PARAM" xlink:href="#knob" transform="translate(0 -3)" />
+ <use xlink:href="#knobguide" transform="translate(0 -3)" />
+ </g>
+
+ <g transform="translate(0 76)">
+ <text font-size="6pt" letter-spacing="2px" transform="translate(13.5 0)">x10</text>
+ <use id="CENTS_MULTIPLE_PARAM" xlink:href="#knob-small" transform="translate(0 -8)" />
+ <use xlink:href="#knobguide-multiple" transform="translate(0 -8)" />
+ </g>
+
+ <g transform="translate(5.5 106)">
+ <rect width="34" height="51" rx="5" fill="#fafafa" />
+ <use id="CV_INPUT" xlink:href="#input" transform="translate(5 3)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(11 35)">CV</text>
+ <g transform="translate(3 39)">
+ <text font-size="5pt" letter-spacing="1px" transform="translate(0 7)">QZ</text>
+ <use id="QUANTIZE_LIGHT" xlink:href="#light" transform="translate(12.5 3)" />
+ <use id="QUANTIZE_PARAM" xlink:href="#button" transform="translate(18.5 0)" />
+ </g>
+ </g>
+
+ <g transform="translate(0 165)">
+ <g transform="translate(5.5 0)">
+ <rect width="34" height="10" fill="#fafafa" transform="translate(0 28)" />
+ <rect width="34" height="35" rx="5" fill="#fafafa" />
+ <use id="IN_INPUT" xlink:href="#input" transform="translate(5 3)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(12.5 35)">IN</text>
+ </g>
+ <g transform="translate(5.5 41)">
+ <rect width="34" height="10" fill="#bbb" transform="translate(0 -3)" />
+ <rect width="34" height="107" rx="5" fill="#bbb" />
+ <use id="THRU_OUTPUT" xlink:href="#output" transform="translate(5 0)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(5.5 32)">THRU</text>
+ <use id="OUT_PLUS_OUTPUT" xlink:href="#output" transform="translate(5 36)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(5.9 68)">OUT+</text>
+ <use id="OUT_MINUS_OUTPUT" xlink:href="#output" transform="translate(5 72)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(5.9 104)">OUT-</text>
+ </g>
+ </g>
+</svg>
diff --git a/res-src/knob_16px-src.svg b/res-src/knob_16px-src.svg
@@ -0,0 +1,14 @@
+<svg
+ version="1.1"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ width="16"
+ height="16"
+ viewBox="0 0 16 16"
+>
+ <g transform="translate(8 8)">
+ <circle r="7.8" fill="#555" />
+ <circle r="6" fill="#333" />
+ <polyline points="0,0 0,-7" stroke-width="2" stroke="#fff" stroke-linecap="round" />
+ </g>
+</svg>
diff --git a/res/Detune.svg b/res/Detune.svg
Binary files differ.
diff --git a/res/knob_16px.svg b/res/knob_16px.svg
Binary files differ.
diff --git a/src/Detune.cpp b/src/Detune.cpp
@@ -0,0 +1,99 @@
+
+#include "bogaudio.hpp"
+
+struct Detune : Module {
+ enum ParamsIds {
+ CENTS_PARAM,
+ CENTS_MULTIPLE_PARAM,
+ QUANTIZE_PARAM,
+ NUM_PARAMS
+ };
+
+ enum InputsIds {
+ CV_INPUT,
+ IN_INPUT,
+ NUM_INPUTS
+ };
+
+ enum OutputsIds {
+ THRU_OUTPUT,
+ OUT_PLUS_OUTPUT,
+ OUT_MINUS_OUTPUT,
+ NUM_OUTPUTS
+ };
+
+ enum LightsIds {
+ QUANTIZE_LIGHT,
+ NUM_LIGHTS
+ };
+
+ Detune() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) {
+ reset();
+ }
+
+ virtual void reset() override;
+ virtual void step() override;
+};
+
+void Detune::reset() {
+}
+
+void Detune::step() {
+ lights[QUANTIZE_LIGHT].value = params[QUANTIZE_PARAM].value == 1.0;
+}
+
+
+DetuneWidget::DetuneWidget() {
+ Detune *module = new Detune();
+ setModule(module);
+ box.size = Vec(RACK_GRID_WIDTH * 3, RACK_GRID_HEIGHT);
+
+ {
+ SVGPanel *panel = new SVGPanel();
+ panel->box.size = box.size;
+ panel->setBackground(SVG::load(assetPlugin(plugin, "res/Detune.svg")));
+ addChild(panel);
+ }
+
+ addChild(createScrew<ScrewSilver>(Vec(0, 0)));
+ addChild(createScrew<ScrewSilver>(Vec(box.size.x - 15, 365)));
+
+ // generated by svg_widgets.rb
+ auto centsParamPosition = Vec(9.5, 31.5);
+ auto centsMultipleParamPosition = Vec(14.5, 82.5);
+ auto quantizeParamPosition = Vec(26.9, 144.9);
+
+ auto cvInputPosition = Vec(10.5, 109.0);
+ auto inInputPosition = Vec(10.5, 168.0);
+
+ auto thruOutputPosition = Vec(10.5, 206.0);
+ auto outPlusOutputPosition = Vec(10.5, 242.0);
+ auto outMinusOutputPosition = Vec(10.5, 278.0);
+
+ auto quantizeLightPosition = Vec(21.0, 148.0);
+ // end generated by svg_widgets.rb
+
+ {
+ auto w = createParam<Knob26>(centsParamPosition, module, Detune::CENTS_PARAM, 0.0, 10.0, 0.0);
+ dynamic_cast<Knob*>(w)->snap = true;
+ addParam(w);
+ }
+ {
+ auto w = createParam<Knob16>(centsMultipleParamPosition, module, Detune::CENTS_MULTIPLE_PARAM, 1.0, 5.0, 1.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(createParam<StatefulButton9>(quantizeParamPosition, module, Detune::QUANTIZE_PARAM, 0.0, 1.0, 1.0));
+
+ addInput(createInput<Port24>(cvInputPosition, module, Detune::CV_INPUT));
+ addInput(createInput<Port24>(inInputPosition, module, Detune::IN_INPUT));
+
+ addOutput(createOutput<Port24>(thruOutputPosition, module, Detune::THRU_OUTPUT));
+ addOutput(createOutput<Port24>(outPlusOutputPosition, module, Detune::OUT_PLUS_OUTPUT));
+ addOutput(createOutput<Port24>(outMinusOutputPosition, module, Detune::OUT_MINUS_OUTPUT));
+
+ addChild(createLight<TinyLight<GreenLight>>(quantizeLightPosition, module, Detune::QUANTIZE_LIGHT));
+}
diff --git a/src/bogaudio.cpp b/src/bogaudio.cpp
@@ -20,6 +20,9 @@ void init(rack::Plugin *p) {
p->addModel(createModel<AnalyzerWidget>("Bogaudio", "Bogaudio-Analyzer", "Analyzer", VISUAL_TAG));
+#ifdef EXPERIMENTAL
+ p->addModel(createModel<DetuneWidget>("Bogaudio", "Bogaudio-Detune", "Detune"));
+#endif
p->addModel(createModel<DGateWidget>("Bogaudio", "Bogaudio-DGate", "DGate", UTILITY_TAG));
p->addModel(createModel<ManualWidget>("Bogaudio", "Bogaudio-Manual", "Manual", UTILITY_TAG));
p->addModel(createModel<NoiseWidget>("Bogaudio", "Bogaudio-Noise", "Noise", NOISE_TAG, UTILITY_TAG));
@@ -30,6 +33,6 @@ void init(rack::Plugin *p) {
p->addModel(createModel<VCAWidget>("Bogaudio", "Bogaudio-VCA", "VCA", AMPLIFIER_TAG, DUAL_TAG, UTILITY_TAG));
#ifdef EXPERIMENTAL
- p->addModel(createModel<TestWidget>("Bogaudio", "Bogaudio-Test", "Test"));
+ p->addModel(createModel<TestWidget>("Bogaudio", "Bogaudio-Test", "Test"));
#endif
}
diff --git a/src/bogaudio.hpp b/src/bogaudio.hpp
@@ -43,6 +43,10 @@ struct AnalyzerWidget : ModuleWidget {
};
+struct DetuneWidget : ModuleWidget {
+ DetuneWidget();
+};
+
struct DGateWidget : ModuleWidget {
DGateWidget();
virtual Menu* createContextMenu() override;
diff --git a/src/widgets.hpp b/src/widgets.hpp
@@ -14,6 +14,13 @@ struct Button18 : SVGSwitch, MomentarySwitch {
}
};
+struct Knob16 : RoundKnob {
+ Knob16() {
+ setSVG(SVG::load(assetPlugin(plugin, "res/knob_16px.svg")));
+ box.size = Vec(16, 16);
+ }
+};
+
struct Knob26 : RoundKnob {
Knob26() {
setSVG(SVG::load(assetPlugin(plugin, "res/knob_26px.svg")));
