commit 2e846b3adc0cff68a327c3e961ba5e719a4e7199
parent 448f40cc2bf72251ac90b0d19b30d5d2ffe3bfc0
Author: Matt Demanett <matt@demanett.net>
Date: Tue, 8 May 2018 00:06:29 -0400
Follow: an envelope follower.
Diffstat:
7 files changed, 260 insertions(+), 4 deletions(-)
diff --git a/res-src/Follow-src.svg b/res-src/Follow-src.svg
@@ -0,0 +1,144 @@
+<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.5" stroke-width="1" stroke="#00f" fill="none" />
+ </g>
+ </symbol>
+
+ <symbol id="knobguide-response" 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)" />
+ <polyline points="0,0 3.5,0" stroke-width="1" stroke="#333" transform="rotate(60) translate(17 0)" />
+ </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(-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(-225) translate(17 0)" />
+ <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(-195) 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 3.5,0" stroke-width="1.0" stroke="#333" transform="rotate(-165) 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(-135) 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(-105) translate(17 0)" />
+ <text font-size="5.0pt" transform="rotate(-90) translate(19 0) rotate(90) translate(-2 2)">1</text>
+ <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(-75) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-45) 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 3.5,0" stroke-width="1.0" stroke="#333" transform="rotate(-15) 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(15) 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(45) translate(17 0)" />
+ <text font-size="5.0pt" transform="rotate(60) translate(20 0) rotate(-60) translate(-2 2)">2</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">FOLLOW</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(8.5 0)">DAMP</text>
+ <use id="RESPONSE_PARAM" xlink:href="#knob" transform="translate(0 3)" />
+ <use xlink:href="#knobguide-response" transform="scale(1) translate(0 3)" />
+ <g transform="translate(5.5 49)">
+ <rect width="34" height="39" rx="5" fill="#fafafa" />
+ <use id="RESPONSE_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(8 0)">SCALE</text>
+ <use id="SCALE_PARAM" xlink:href="#knob" transform="translate(0 3)" />
+ <use xlink:href="#knobguide-scale" transform="scale(1) translate(0 3)" />
+ <g transform="translate(5.5 49)">
+ <rect width="34" height="38" rx="5" fill="#fafafa" />
+ <use id="SCALE_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/Follow.svg b/res/Follow.svg
Binary files differ.
diff --git a/src/Follow.cpp b/src/Follow.cpp
@@ -0,0 +1,61 @@
+
+#include "Follow.hpp"
+
+void Follow::onSampleRateChange() {
+ _rms.setSampleRate(engineGetSampleRate());
+}
+
+void Follow::step() {
+ if (inputs[IN_INPUT].active && outputs[OUT_OUTPUT].active) {
+ float response = params[RESPONSE_PARAM].value;
+ if (inputs[RESPONSE_INPUT].active) {
+ response *= clamp(inputs[RESPONSE_INPUT].value / 10.f, 0.0f, 1.0f);
+ }
+ _rms.setSensitivity(response);
+
+ float scale = params[SCALE_PARAM].value;
+ if (inputs[SCALE_INPUT].active) {
+ scale *= clamp(inputs[SCALE_INPUT].value / 5.0f, -1.0f, 1.0f);
+ }
+
+ outputs[OUT_OUTPUT].value = scale * _rms.next(inputs[IN_INPUT].value);
+ }
+}
+
+struct FollowWidget : ModuleWidget {
+ FollowWidget(Follow* 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/Follow.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 responseParamPosition = Vec(7.5, 35.5);
+ auto scaleParamPosition = Vec(7.5, 141.5);
+
+ auto responseInputPosition = Vec(10.5, 77.0);
+ auto scaleInputPosition = 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>(responseParamPosition, module, Follow::RESPONSE_PARAM, 0.0, 1.0, 0.3));
+ addParam(ParamWidget::create<Knob29>(scaleParamPosition, module, Follow::SCALE_PARAM, 0.0, 2.0, 1.0));
+
+ addInput(Port::create<Port24>(responseInputPosition, Port::INPUT, module, Follow::RESPONSE_INPUT));
+ addInput(Port::create<Port24>(scaleInputPosition, Port::INPUT, module, Follow::SCALE_INPUT));
+ addInput(Port::create<Port24>(inInputPosition, Port::INPUT, module, Follow::IN_INPUT));
+
+ addOutput(Port::create<Port24>(outOutputPosition, Port::OUTPUT, module, Follow::OUT_OUTPUT));
+ }
+};
+
+Model* modelFollow = Model::create<Follow, FollowWidget>("Bogaudio", "Bogaudio-Follow", "Follow", ENVELOPE_FOLLOWER_TAG, UTILITY_TAG);
diff --git a/src/Follow.hpp b/src/Follow.hpp
@@ -0,0 +1,48 @@
+#pragma once
+
+#include "bogaudio.hpp"
+#include "dsp/signal.hpp"
+
+using namespace bogaudio::dsp;
+
+extern Model* modelFollow;
+
+namespace bogaudio {
+
+struct Follow : Module {
+ enum ParamsIds {
+ RESPONSE_PARAM,
+ SCALE_PARAM,
+ NUM_PARAMS
+ };
+
+ enum InputsIds {
+ RESPONSE_INPUT,
+ SCALE_INPUT,
+ IN_INPUT,
+ NUM_INPUTS
+ };
+
+ enum OutputsIds {
+ OUT_OUTPUT,
+ NUM_OUTPUTS
+ };
+
+ enum LightsIds {
+ NUM_LIGHTS
+ };
+
+ RootMeanSquare _rms;
+
+ Follow()
+ : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS)
+ , _rms(1000.0f, 1.0f, 500.0f)
+ {
+ onSampleRateChange();
+ }
+
+ virtual void onSampleRateChange() override;
+ virtual void step() override;
+};
+
+} // namespace bogaudio
diff --git a/src/bogaudio.cpp b/src/bogaudio.cpp
@@ -21,6 +21,7 @@
#include "Bool.hpp"
#include "Detune.hpp"
#include "DGate.hpp"
+#include "Follow.hpp"
#include "Manual.hpp"
#include "Mult.hpp"
#include "Noise.hpp"
@@ -73,6 +74,9 @@ void init(rack::Plugin *p) {
#endif
p->addModel(modelDetune);
p->addModel(modelDGate);
+#ifdef EXPERIMENTAL
+ p->addModel(modelFollow);
+#endif
p->addModel(modelManual);
#ifdef EXPERIMENTAL
p->addModel(modelMult);
diff --git a/src/dsp/signal.cpp b/src/dsp/signal.cpp
@@ -55,7 +55,7 @@ void RootMeanSquare::setSampleRate(float sampleRate) {
if (_buffer) {
delete[] _buffer;
}
- _bufferN = (maxDelayMS / 1000.0f) * _sampleRate;
+ _bufferN = (_maxDelayMS / 1000.0f) * _sampleRate;
_buffer = new float[_bufferN] {};
if (_initialized) {
_initialized = false;
diff --git a/src/dsp/signal.hpp b/src/dsp/signal.hpp
@@ -39,8 +39,7 @@ struct Amplifier {
};
struct RootMeanSquare {
- const float maxDelayMS = 300.0;
- const float minDelayMS = 0.2;
+ float _maxDelayMS;
float _sampleRate = -1.0f;
float _sensitivity = -1.0f;
@@ -52,7 +51,7 @@ struct RootMeanSquare {
int _trailI = 0;
double _sum = 0;
- RootMeanSquare(float sampleRate = 1000.0f, float sensitivity = 1.0f) {
+ RootMeanSquare(float sampleRate = 1000.0f, float sensitivity = 1.0f, float maxDelayMS = 300.0f) : _maxDelayMS(maxDelayMS) {
setSampleRate(sampleRate);
setSensitivity(sensitivity);
}
