commit 5f6ea9ba2331971ea372bb6855b33b3654f922f7
parent 638ec265b390a22492efd04464740ef14b51b982
Author: Matt Demanett <matt@demanett.net>
Date: Thu, 24 May 2018 23:44:52 -0400
Rename CVDelay to CVD; add time range knob.
Diffstat:
9 files changed, 287 insertions(+), 243 deletions(-)
diff --git a/res-src/CVD-src.svg b/res-src/CVD-src.svg
@@ -0,0 +1,153 @@
+<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="14" stroke-width="1" stroke="#00f" fill="none" />
+ </g>
+ </symbol>
+
+ <symbol id="knob-smallest" viewBox="0 0 16px 16px">
+ <g transform="translate(8 8)">
+ <polyline points="-3,0 3,0" stroke-width="1" stroke="#00f" />
+ <polyline points="0,-3 0,3" stroke-width="1" stroke="#00f" />
+ <circle r="7.5" stroke-width="1" stroke="#00f" fill="none" />
+ </g>
+ </symbol>
+
+ <symbol id="knobguide-time" viewBox="0 0 45px 45px">
+ <g transform="translate(22.5 22.5)">
+ <text font-size="5.0pt" transform="rotate(-240) translate(20 0) rotate(240) translate(-2 2)">0</text>
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-210) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-180) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-150) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-120) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-90) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-60) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-30) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(0) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(30) translate(17 0)" />
+ <text font-size="5.0pt" transform="rotate(60) translate(20 0) rotate(-60) translate(-2 2)">1</text>
+ </g>
+ </symbol>
+
+ <symbol id="knobguide-scale" viewBox="0 0 45px 45px">
+ <g transform="translate(22.5 22.5)">
+ <text font-size="5.0pt" transform="rotate(-135) translate(15 0) rotate(135) translate(-8 2)">0.1</text>
+ <polyline points="0,0 2,0" stroke-width="1" stroke="#333" transform="rotate(-135) translate(9.5 0)" />
+ <text font-size="5.0pt" transform="rotate(-90) translate(15 0) rotate(90) translate(-2 2)">1</text>
+ <polyline points="0,0 2,0" stroke-width="1" stroke="#333" transform="rotate(-90) translate(9.5 0)" />
+ <text font-size="5.0pt" transform="rotate(-45) translate(15 0) rotate(45) translate(-2 2)">10</text>
+ <polyline points="0,0 2,0" stroke-width="1" stroke="#333" transform="rotate(-45) translate(9.5 0)" />
+ </g>
+ </symbol>
+
+ <symbol id="knobguide-mix" viewBox="0 0 45px 45px">
+ <g transform="translate(22.5 22.5)">
+ <text font-size="5.0pt" transform="rotate(-240) translate(20 0) rotate(240) translate(-2 2)">D</text>
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-210) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-180) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-150) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-120) translate(17 0)" />
+ <polyline points="0,0 3.5,0" stroke-width="1" stroke="#333" transform="rotate(-90) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-60) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-30) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(0) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(30) translate(17 0)" />
+ <text font-size="5.0pt" transform="rotate(60) translate(20 0) rotate(-60) translate(-2 2)">W</text>
+ </g>
+ </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="0,0 0,300" stroke="#0f0" stroke-width="1" fill="none" transform="translate(22.5 0)" /> -->
+
+ <g transform="rotate(-90) translate(-376 13)">
+ <text class="title" font-size="7pt" letter-spacing="2.5px">CVD</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="2.0px" transform="translate(9.5 0)">TIME</text>
+ <use id="TIME_PARAM" xlink:href="#knob" transform="translate(0 3)" />
+ <use xlink:href="#knobguide-time" transform="translate(0 3)" />
+ <use id="TIME_SCALE_PARAM" xlink:href="#knob-smallest" transform="translate(14.5 59)" />
+ <use xlink:href="#knobguide-scale" transform="translate(0 44.5)" />
+ <g transform="translate(5.5 79)">
+ <rect width="34" height="39" rx="5" fill="#fafafa" />
+ <use id="TIME_INPUT" xlink:href="#input" transform="translate(5 3)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(11 35)">CV</text>
+ </g>
+ </g>
+
+ <g transform="translate(0 165)">
+ <text font-size="6pt" letter-spacing="1px" transform="translate(2 0)">DRY/WET</text>
+ <use id="MIX_PARAM" xlink:href="#knob" transform="translate(0 3)" />
+ <use xlink:href="#knobguide-mix" transform="translate(0 3)" />
+ <g transform="translate(5.5 49)">
+ <rect width="34" height="38" rx="5" fill="#fafafa" />
+ <use id="MIX_INPUT" xlink:href="#input" transform="translate(5 3)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(11 35)">CV</text>
+ </g>
+ </g>
+
+ <g transform="translate(0 264)">
+ <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="35" rx="5" fill="#bbb" />
+ <use id="OUT_OUTPUT" xlink:href="#output" transform="translate(5 0)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(8.3 32)">OUT</text>
+ </g>
+ </g>
+</svg>
diff --git a/res-src/CVDelay-src.svg b/res-src/CVDelay-src.svg
@@ -1,134 +0,0 @@
-<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="14" stroke-width="1" stroke="#00f" fill="none" />
- </g>
- </symbol>
-
- <symbol id="knobguide-time" viewBox="0 0 45px 45px">
- <g transform="translate(22.5 22.5)">
- <text font-size="5.0pt" transform="rotate(-240) translate(20 0) rotate(240) translate(-2 2)">0</text>
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-210) translate(17 0)" />
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-180) translate(17 0)" />
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-150) translate(17 0)" />
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-120) translate(17 0)" />
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-90) translate(17 0)" />
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-60) translate(17 0)" />
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-30) translate(17 0)" />
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(0) translate(17 0)" />
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(30) translate(17 0)" />
- <text font-size="5.0pt" transform="rotate(60) translate(20 0) rotate(-60) translate(-2 2)">1s</text>
- </g>
- </symbol>
-
- <symbol id="knobguide-mix" viewBox="0 0 45px 45px">
- <g transform="translate(22.5 22.5)">
- <text font-size="5.0pt" transform="rotate(-240) translate(20 0) rotate(240) translate(-2 2)">D</text>
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-210) translate(17 0)" />
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-180) translate(17 0)" />
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-150) translate(17 0)" />
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-120) translate(17 0)" />
- <polyline points="0,0 3.5,0" stroke-width="1" stroke="#333" transform="rotate(-90) translate(17 0)" />
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-60) translate(17 0)" />
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-30) translate(17 0)" />
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(0) translate(17 0)" />
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(30) translate(17 0)" />
- <text font-size="5.0pt" transform="rotate(60) translate(20 0) rotate(-60) translate(-2 2)">W</text>
- </g>
- </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="0,0 0,300" stroke="#0f0" stroke-width="1" fill="none" transform="translate(22.5 0)" /> -->
-
- <g transform="rotate(-90) translate(-376 13)">
- <text class="title" font-size="7pt" letter-spacing="2.5px">CVDELAY</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="2.0px" transform="translate(9.5 0)">TIME</text>
- <use id="TIME_PARAM" xlink:href="#knob" transform="translate(0 3)" />
- <use xlink:href="#knobguide-time" transform="scale(1) translate(0 3)" />
- <g transform="translate(5.5 49)">
- <rect width="34" height="39" rx="5" fill="#fafafa" />
- <use id="TIME_INPUT" xlink:href="#input" transform="translate(5 3)" />
- <text font-size="5pt" letter-spacing="2px" transform="translate(11 35)">CV</text>
- </g>
- </g>
-
- <g transform="translate(0 131)">
- <text font-size="6pt" letter-spacing="1px" transform="translate(2 0)">DRY/WET</text>
- <use id="MIX_PARAM" xlink:href="#knob" transform="translate(0 3)" />
- <use xlink:href="#knobguide-mix" transform="scale(1) translate(0 3)" />
- <g transform="translate(5.5 49)">
- <rect width="34" height="38" rx="5" fill="#fafafa" />
- <use id="MIX_INPUT" xlink:href="#input" transform="translate(5 3)" />
- <text font-size="5pt" letter-spacing="2px" transform="translate(11 35)">CV</text>
- </g>
- </g>
-
- <g transform="translate(0 230)">
- <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="35" rx="5" fill="#bbb" />
- <use id="OUT_OUTPUT" xlink:href="#output" transform="translate(5 0)" />
- <text font-size="5pt" letter-spacing="2px" transform="translate(8.3 32)">OUT</text>
- </g>
- </g>
-
- <!-- <polyline points="0,0 45,0" stroke-width="0.5" stroke="#0f0" transform="translate(0 73)" /> -->
-</svg>
diff --git a/res/CVD.svg b/res/CVD.svg
Binary files differ.
diff --git a/res/CVDelay.svg b/res/CVDelay.svg
Binary files differ.
diff --git a/src/CVD.cpp b/src/CVD.cpp
@@ -0,0 +1,82 @@
+
+#include "CVD.hpp"
+
+void CVD::onSampleRateChange() {
+ _delay.setSampleRate(engineGetSampleRate());
+}
+
+void CVD::step() {
+ float time = params[TIME_PARAM].value;
+ if (inputs[TIME_INPUT].active) {
+ time *= clamp(params[TIME_INPUT].value / 10.0f, 0.0f, 1.0f);
+ }
+ switch ((int)params[TIME_SCALE_PARAM].value) {
+ case 0: {
+ time /= 100.f;
+ break;
+ }
+ case 1: {
+ time /= 10.f;
+ break;
+ }
+ }
+ _delay.setTime(time);
+
+ float mix = params[MIX_PARAM].value;
+ if (inputs[MIX_INPUT].active) {
+ mix *= clamp(inputs[MIX_INPUT].value / 5.0f, -1.0f, 1.0f);
+ }
+ _mix.setParams(mix);
+
+ float in = inputs[IN_INPUT].value;
+ float delayed = _delay.next(in);
+ outputs[OUT_OUTPUT].value = _mix.next(in, delayed);
+}
+
+struct CVDWidget : ModuleWidget {
+ CVDWidget(CVD* module) : ModuleWidget(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/CVD.svg")));
+ addChild(panel);
+ }
+
+ addChild(Widget::create<ScrewSilver>(Vec(0, 0)));
+ addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365)));
+
+ // generated by svg_widgets.rb
+ auto timeParamPosition = Vec(8.0, 36.0);
+ auto timeScaleParamPosition = Vec(14.5, 84.0);
+ auto mixParamPosition = Vec(8.0, 176.0);
+
+ auto timeInputPosition = Vec(10.5, 107.0);
+ auto mixInputPosition = Vec(10.5, 217.0);
+ auto inInputPosition = Vec(10.5, 267.0);
+
+ 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));
+ {
+ auto w = ParamWidget::create<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;
+ k->maxAngle = M_PI / 4.0f;
+ k->speed = 3.0;
+ addParam(w);
+ }
+ addParam(ParamWidget::create<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));
+
+ addOutput(Port::create<Port24>(outOutputPosition, Port::OUTPUT, module, CVD::OUT_OUTPUT));
+ }
+};
+
+Model* modelCVD = Model::create<CVD, CVDWidget>("Bogaudio", "Bogaudio-CVD", "CVD", DELAY_TAG, UTILITY_TAG);
diff --git a/src/CVD.hpp b/src/CVD.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "bogaudio.hpp"
+#include "dsp/signal.hpp"
+
+using namespace bogaudio::dsp;
+
+extern Model* modelCVD;
+
+namespace bogaudio {
+
+struct CVD : Module {
+ enum ParamsIds {
+ TIME_PARAM,
+ TIME_SCALE_PARAM,
+ MIX_PARAM,
+ NUM_PARAMS
+ };
+
+ enum InputsIds {
+ TIME_INPUT,
+ MIX_INPUT,
+ IN_INPUT,
+ NUM_INPUTS
+ };
+
+ enum OutputsIds {
+ OUT_OUTPUT,
+ NUM_OUTPUTS
+ };
+
+ enum LightsIds {
+ NUM_LIGHTS
+ };
+
+ DelayLine _delay;
+ CrossFader _mix;
+
+ CVD()
+ : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS)
+ , _delay(1000.0f, 10000.0f)
+ {
+ onSampleRateChange();
+ }
+
+ virtual void onSampleRateChange() override;
+ virtual void step() override;
+};
+
+} // namespace bogaudio
diff --git a/src/CVDelay.cpp b/src/CVDelay.cpp
@@ -1,61 +0,0 @@
-
-#include "CVDelay.hpp"
-
-void CVDelay::onSampleRateChange() {
- _delay.setSampleRate(engineGetSampleRate());
-}
-
-void CVDelay::step() {
- float time = params[TIME_PARAM].value;
- if (inputs[TIME_INPUT].active) {
- time *= clamp(params[TIME_INPUT].value / 10.0f, 0.0f, 1.0f);
- }
- _delay.setTime(time);
- float mix = params[MIX_PARAM].value;
- if (inputs[MIX_INPUT].active) {
- mix *= clamp(inputs[MIX_INPUT].value / 5.0f, -1.0f, 1.0f);
- }
- _mix.setParams(mix);
-
- float in = inputs[IN_INPUT].value;
- float delayed = _delay.next(in);
- outputs[OUT_OUTPUT].value = _mix.next(in, delayed);
-}
-
-struct CVDelayWidget : ModuleWidget {
- CVDelayWidget(CVDelay* module) : ModuleWidget(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/CVDelay.svg")));
- addChild(panel);
- }
-
- addChild(Widget::create<ScrewSilver>(Vec(0, 0)));
- addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365)));
-
- // generated by svg_widgets.rb
- auto timeParamPosition = Vec(8.0, 36.0);
- auto mixParamPosition = Vec(8.0, 142.0);
-
- auto timeInputPosition = Vec(10.5, 77.0);
- auto mixInputPosition = Vec(10.5, 183.0);
- auto inInputPosition = Vec(10.5, 233.0);
-
- auto outOutputPosition = Vec(10.5, 271.0);
- // end generated by svg_widgets.rb
-
- addParam(ParamWidget::create<Knob29>(timeParamPosition, module, CVDelay::TIME_PARAM, 0.0, 1.0, 0.1));
- addParam(ParamWidget::create<Knob29>(mixParamPosition, module, CVDelay::MIX_PARAM, -1.0, 1.0, 0.0));
-
- addInput(Port::create<Port24>(timeInputPosition, Port::INPUT, module, CVDelay::TIME_INPUT));
- addInput(Port::create<Port24>(mixInputPosition, Port::INPUT, module, CVDelay::MIX_INPUT));
- addInput(Port::create<Port24>(inInputPosition, Port::INPUT, module, CVDelay::IN_INPUT));
-
- addOutput(Port::create<Port24>(outOutputPosition, Port::OUTPUT, module, CVDelay::OUT_OUTPUT));
- }
-};
-
-Model* modelCVDelay = Model::create<CVDelay, CVDelayWidget>("Bogaudio", "Bogaudio-CVDelay", "CVDelay", DELAY_TAG, UTILITY_TAG);
diff --git a/src/CVDelay.hpp b/src/CVDelay.hpp
@@ -1,46 +0,0 @@
-#pragma once
-
-#include "bogaudio.hpp"
-#include "dsp/signal.hpp"
-
-using namespace bogaudio::dsp;
-
-extern Model* modelCVDelay;
-
-namespace bogaudio {
-
-struct CVDelay : Module {
- enum ParamsIds {
- TIME_PARAM,
- MIX_PARAM,
- NUM_PARAMS
- };
-
- enum InputsIds {
- TIME_INPUT,
- MIX_INPUT,
- IN_INPUT,
- NUM_INPUTS
- };
-
- enum OutputsIds {
- OUT_OUTPUT,
- NUM_OUTPUTS
- };
-
- enum LightsIds {
- NUM_LIGHTS
- };
-
- DelayLine _delay;
- CrossFader _mix;
-
- CVDelay() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) {
- onSampleRateChange();
- }
-
- virtual void onSampleRateChange() override;
- virtual void step() override;
-};
-
-} // namespace bogaudio
diff --git a/src/bogaudio.cpp b/src/bogaudio.cpp
@@ -21,7 +21,7 @@
#include "ADSR.hpp"
#include "Bool.hpp"
-#include "CVDelay.hpp"
+#include "CVD.hpp"
#include "Detune.hpp"
#include "DGate.hpp"
#include "FlipFlop.hpp"
@@ -80,7 +80,7 @@ void init(rack::Plugin *p) {
#ifdef EXPERIMENTAL
p->addModel(modelADSR);
p->addModel(modelBool);
- p->addModel(modelCVDelay);
+ p->addModel(modelCVD);
#endif
p->addModel(modelDetune);
p->addModel(modelDGate);
