commit 7ef248f80792c6f3c6cd6482ad550cd0fdb32854
parent 549db0396216b2aec37cc82069b79c7b859293aa
Author: Matt Demanett <matt@demanett.net>
Date: Fri, 11 Oct 2019 22:09:08 -0400
Poly: add MONO module; a version of core SUM with onboard compression.
Diffstat:
7 files changed, 461 insertions(+), 36 deletions(-)
diff --git a/plugin.json b/plugin.json
@@ -414,6 +414,15 @@
]
},
{
+ "slug": "Bogaudio-Mono",
+ "name": "Mono",
+ "description": "poly-to-mono converter with onboard compressor",
+ "tags": [
+ "Utility",
+ "Polyphonic"
+ ]
+ },
+ {
"slug": "Bogaudio-Bool",
"name": "BOOL",
"description": "boolean logic",
diff --git a/res-src/Mono-src.svg b/res-src/Mono-src.svg
@@ -0,0 +1,174 @@
+<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="light-small" viewBox="0 0 6.4px 6.4px">
+ <rect width="6.4" height="6.4" fill="#0f0" />
+ </symbol>
+
+ <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="knobguide-linear" viewBox="0 0 45px 45px">
+ <g transform="translate(22.5 22.5)">
+ <text font-size="5.0pt" transform="rotate(-240) translate(18 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(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-180) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-150) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-120) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-90) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-60) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-30) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(0) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(30) translate(15 0)" />
+ <polyline points="0,0 3.5,0" stroke-width="1" stroke="#333" transform="rotate(60) translate(15 0)" />
+ </g>
+ </symbol>
+
+ <symbol id="compression" viewBox="0 0 11px 75px">
+ <!-- <rect width="11" height="75" x="0" y="0" rx="0" fill="#ccc" /> -->
+ <rect width="5" height="13" x="0" y="1" rx="0" fill="#aaa" transform="translate(3 0)" />
+ <rect width="5" height="13" x="0" y="1" rx="0" fill="#aaa" transform="translate(3 15)" />
+ </symbol>
+
+ <symbol id="guide-compression" viewBox="0 0 20px 95px">
+ <g transform="translate(0 10)">
+ <g transform="translate(0 0)">
+ <polyline points="0,0 3,0" stroke="#333" fill="none" transform="translate(11 0)" />
+ <text font-size="6.0pt" transform="translate(7 0) rotate(-90) translate(-4.5 2.2)">12+</text>
+ </g>
+ <g transform="translate(0 15)">
+ <polyline points="0,0 3,0" stroke="#333" fill="none" transform="translate(11 0)" />
+ <text font-size="6.0pt" transform="translate(7 0) rotate(-90) translate(-2.5 2.2)">6</text>
+ </g>
+ <g transform="translate(0 30)">
+ <polyline points="0,0 3,0" stroke="#333" fill="none" transform="translate(11 0)" />
+ <text font-size="6.0pt" transform="translate(7 0) rotate(-90) translate(-2.5 2.2)">0</text>
+ </g>
+
+ <g transform="translate(0 15)">
+ <!-- <polyline points="0,0 3,0" stroke="#333" fill="none" transform="translate(23 0)" /> -->
+ <text font-size="6.0pt" transform="translate(31 0) rotate(-90) translate(-4.5 2.2)">dB</text>
+ </g>
+ </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="22.5,0 22.5,380" stroke-width="0.5" stroke="#0f0" /> -->
+
+ <g transform="rotate(-90) translate(-376 13)">
+ <text class="title" font-size="7pt" letter-spacing="2.5px">MONO</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 0)">CHAN</text>
+ </g>
+
+ <g transform="translate(2.5 30)">
+ <!-- <rect width="40" height="40" fill="#fafafa" transform="translate(0 0)" /> -->
+ <use id="CHANNEL_1_WIDGET" xlink:href="#light-small" transform="translate(0, 0) translate(1.8 1.8)" />
+ <use id="CHANNEL_2_WIDGET" xlink:href="#light-small" transform="translate(10, 0) translate(1.8 1.8)" />
+ <use id="CHANNEL_3_WIDGET" xlink:href="#light-small" transform="translate(20, 0) translate(1.8 1.8)" />
+ <use id="CHANNEL_4_WIDGET" xlink:href="#light-small" transform="translate(30, 0) translate(1.8 1.8)" />
+
+ <use id="CHANNEL_5_WIDGET" xlink:href="#light-small" transform="translate(0, 10) translate(1.8 1.8)" />
+ <use id="CHANNEL_6_WIDGET" xlink:href="#light-small" transform="translate(10, 10) translate(1.8 1.8)" />
+ <use id="CHANNEL_7_WIDGET" xlink:href="#light-small" transform="translate(20, 10) translate(1.8 1.8)" />
+ <use id="CHANNEL_8_WIDGET" xlink:href="#light-small" transform="translate(30, 10) translate(1.8 1.8)" />
+
+ <use id="CHANNEL_9_WIDGET" xlink:href="#light-small" transform="translate(0, 20) translate(1.8 1.8)" />
+ <use id="CHANNEL_10_WIDGET" xlink:href="#light-small" transform="translate(10, 20) translate(1.8 1.8)" />
+ <use id="CHANNEL_11_WIDGET" xlink:href="#light-small" transform="translate(20, 20) translate(1.8 1.8)" />
+ <use id="CHANNEL_12_WIDGET" xlink:href="#light-small" transform="translate(30, 20) translate(1.8 1.8)" />
+
+ <use id="CHANNEL_13_WIDGET" xlink:href="#light-small" transform="translate(0, 30) translate(1.8 1.8)" />
+ <use id="CHANNEL_14_WIDGET" xlink:href="#light-small" transform="translate(10, 30) translate(1.8 1.8)" />
+ <use id="CHANNEL_15_WIDGET" xlink:href="#light-small" transform="translate(20, 30) translate(1.8 1.8)" />
+ <use id="CHANNEL_16_WIDGET" xlink:href="#light-small" transform="translate(30, 30) translate(1.8 1.8)" />
+ </g>
+
+ <!-- <rect width="45" height="14" fill="#0f0" transform="translate(0 72)" /> -->
+ <!-- <rect width="45" height="14" fill="#0f0" transform="translate(0 178)" /> -->
+ <!-- <rect width="45" height="14" fill="#0f0" transform="translate(0 237)" /> -->
+
+ <g transform="translate(0 92)">
+ <text font-size="6pt" letter-spacing="2.0px" transform="translate(8 0)">COMP</text>
+ <use id="COMPRESSION_PARAM" xlink:href="#knob" transform="translate(0 -2)" />
+ <use xlink:href="#knobguide-linear" transform="translate(0 -2)" />
+ </g>
+
+ <g transform="translate(17 147)">
+ <use id="COMPRESSION_WIDGET" xlink:href="#compression" transform="translate(0 -1)" />
+ <use xlink:href="#guide-compression" transform="translate(-13 -11)" />
+ </g>
+
+ <g transform="translate(0 198)">
+ <text font-size="6pt" letter-spacing="2.0px" transform="translate(7 0)">LEVEL</text>
+ <use id="LEVEL_PARAM" xlink:href="#knob" transform="translate(0 -2)" />
+ <use xlink:href="#knobguide-linear" transform="translate(0 -2)" />
+ </g>
+
+ <g transform="translate(0 251)">
+ <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="POLY_INPUT" xlink:href="#input" transform="translate(5 3)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(6 35)">POLY</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="MONO_OUTPUT" xlink:href="#output" transform="translate(5 0)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(4.5 32)">MONO</text>
+ </g>
+ </g>
+</svg>
diff --git a/res/Mono.svg b/res/Mono.svg
Binary files differ.
diff --git a/src/Mono.cpp b/src/Mono.cpp
@@ -0,0 +1,181 @@
+
+#include "Mono.hpp"
+
+void Mono::sampleRateChange() {
+ float sr = APP->engine->getSampleRate();
+ _detectorRMS.setSampleRate(sr);
+ _attackSL.setParams(sr, 50.0f);
+ _releaseSL.setParams(sr, _releaseMS);
+ for (int c = 0; c < maxChannels; ++c) {
+ _channelRMSs[c].setSampleRate(sr);
+ }
+}
+
+void Mono::modulate() {
+ float comp = clamp(params[COMPRESSION_PARAM].getValue(), 0.0f, 1.0f);
+ _ratio = (comp * comp) * 25.0f + 1.0f;
+ _releaseMS = std::max(200.0f, comp * 500.0f);
+ _releaseSL.setParams(APP->engine->getSampleRate(), _releaseMS);
+
+ float level = clamp(params[LEVEL_PARAM].getValue(), 0.0f, 1.0f);
+ level = 1.0f - level;
+ level *= _levelAmp.minDecibels;
+ _levelAmp.setLevel(level);
+}
+
+void Mono::processChannel(const ProcessArgs& args, int c) {
+ assert(c == 0);
+
+ _activeChannels = inputs[POLY_INPUT].getChannels();
+ float out = 0.0f;
+ for (int c = 0; c < _activeChannels; ++c) {
+ float v = inputs[POLY_INPUT].getVoltage(c);
+ out += v;
+ _channelLevels[c] = _channelRMSs[c].next(v) / 5.0f;
+ }
+ for (int c = _activeChannels; c < maxChannels; ++c) {
+ _channelLevels[c] = _channelRMSs[c].next(0.0f) / 5.0f;
+ }
+
+ float env = _detectorRMS.next(out);
+ if (env > _lastEnv) {
+ env = _attackSL.next(env, _lastEnv);
+ }
+ else {
+ env = _releaseSL.next(env, _lastEnv);
+ }
+ _lastEnv = env;
+
+ float detectorDb = amplitudeToDecibels(env / 5.0f);
+ _compressionDb = _compressor.compressionDb(detectorDb, 0.0f, _ratio, true);
+ _compAmp.setLevel(-_compressionDb);
+
+ out = _compAmp.next(out);
+ out = _levelAmp.next(out);
+ out = _saturator.next(out);
+ outputs[MONO_OUTPUT].setVoltage(out);
+}
+
+struct MonoWidget : ModuleWidget {
+ struct ChannelsDisplay : OpaqueWidget {
+ const NVGcolor inactiveBgColor = nvgRGBA(0xaa, 0xaa, 0xaa, 0xff);
+ const NVGcolor activeBgColor = nvgRGBA(0x66, 0x66, 0x66, 0xff);
+ Mono* _module;
+
+ ChannelsDisplay(Mono* module) : _module(module) {
+ }
+
+ void draw(const DrawArgs& args) override {
+ nvgSave(args.vg);
+ for (int i = 0; i < _module->maxChannels; ++i) {
+ nvgBeginPath(args.vg);
+ if (!_module || i >= _module->_activeChannels) {
+ nvgFillColor(args.vg, inactiveBgColor);
+ }
+ else {
+ nvgFillColor(args.vg, activeBgColor);
+ }
+ nvgCircle(args.vg, (i % 4) * 10 + 5.0f, (i / 4) * 10 + 5.0f, 3.2f);
+ nvgFill(args.vg);
+
+ if (_module && _module->_channelLevels[i] > 0.0f) {
+ nvgFillColor(args.vg, decibelsToColor(amplitudeToDecibels(_module->_channelLevels[i])));
+ nvgFill(args.vg);
+ }
+ }
+ nvgRestore(args.vg);
+ }
+ };
+
+ struct CompressionDisplay : OpaqueWidget {
+ struct Level {
+ float db;
+ NVGcolor color;
+ Level(float db, const NVGcolor& color) : db(db), color(color) {}
+ };
+
+ const NVGcolor bgColor = nvgRGBA(0xaa, 0xaa, 0xaa, 0xff);
+ Mono* _module;
+ std::vector<Level> _levels;
+
+ CompressionDisplay(Mono* module) : _module(module) {
+ auto color = nvgRGBA(0xff, 0xaa, 0x00, 0xff);
+ _levels.push_back(Level(12.0f, color));
+ for (int i = 1; i <= 6; ++i) {
+ float db = 12.0f - i*2.0f;
+ _levels.push_back(Level(db, color));
+ }
+ }
+
+ void draw(const DrawArgs& args) override {
+ float compressionDb = 0.0f;
+ if (_module) {
+ compressionDb = _module->_compressionDb;
+ }
+
+ nvgSave(args.vg);
+ for (int i = 0; i < 35; i += 5) {
+ const Level& l = _levels.at(i / 5);
+
+ nvgBeginPath(args.vg);
+ nvgRect(args.vg, 3, i + 1, 5, 4);
+ nvgFillColor(args.vg, bgColor);
+ nvgFill(args.vg);
+ if (compressionDb > l.db) {
+ nvgFillColor(args.vg, l.color);
+ nvgFill(args.vg);
+ }
+ }
+ nvgRestore(args.vg);
+ }
+ };
+
+ static constexpr int hp = 3;
+
+ MonoWidget(Mono* module) {
+ setModule(module);
+ box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT);
+
+ {
+ SvgPanel *panel = new SvgPanel();
+ panel->box.size = box.size;
+ panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Mono.svg")));
+ addChild(panel);
+ }
+
+ {
+ auto display = new ChannelsDisplay(module);
+ display->box.pos = Vec(2.5f, 30.0f);
+ display->box.size = Vec(40.0f, 40.0f);
+ addChild(display);
+ }
+
+ {
+ auto display = new CompressionDisplay(module);
+ display->box.pos = Vec(17.5f, 142.5f);
+ display->box.size = Vec(18.0f, 50.0f);
+ addChild(display);
+ }
+
+ addChild(createWidget<ScrewSilver>(Vec(0, 0)));
+ addChild(createWidget<ScrewSilver>(Vec(box.size.x - 15, 365)));
+
+ // generated by svg_widgets.rb
+ auto compressionParamPosition = Vec(9.5, 98.5);
+ auto levelParamPosition = Vec(9.5, 206.5);
+
+ auto polyInputPosition = Vec(10.5, 253.0);
+
+ auto monoOutputPosition = Vec(10.5, 291.0);
+ // end generated by svg_widgets.rb
+
+ addParam(createParam<Knob26>(compressionParamPosition, module, Mono::COMPRESSION_PARAM));
+ addParam(createParam<Knob26>(levelParamPosition, module, Mono::LEVEL_PARAM));
+
+ addInput(createInput<Port24>(polyInputPosition, module, Mono::POLY_INPUT));
+
+ addOutput(createOutput<Port24>(monoOutputPosition, module, Mono::MONO_OUTPUT));
+ }
+};
+
+Model* modelMono = createModel<Mono, MonoWidget>("Bogaudio-Mono", "Mono", "poly-to-mono converter with onboard compressor", "Utility", "Polyphonic");
diff --git a/src/Mono.hpp b/src/Mono.hpp
@@ -0,0 +1,58 @@
+#pragma once
+
+#include "bogaudio.hpp"
+#include "dsp/signal.hpp"
+
+using namespace bogaudio::dsp;
+
+extern Model* modelMono;
+
+namespace bogaudio {
+
+struct Mono : BGModule {
+ enum ParamsIds {
+ COMPRESSION_PARAM,
+ LEVEL_PARAM,
+ NUM_PARAMS
+ };
+
+ enum InputsIds {
+ POLY_INPUT,
+ NUM_INPUTS
+ };
+
+ enum OutputsIds {
+ MONO_OUTPUT,
+ NUM_OUTPUTS
+ };
+
+ enum LightsIds {
+ NUM_LIGHTS
+ };
+
+ RootMeanSquare _channelRMSs[maxChannels];
+ float _channelLevels[maxChannels] {};
+ RootMeanSquare _detectorRMS;
+ bogaudio::dsp::SlewLimiter _attackSL, _releaseSL;
+ Compressor _compressor;
+ Amplifier _compAmp, _levelAmp;
+ Saturator _saturator;
+ int _activeChannels = 0;
+ float _ratio = 2.0f;
+ float _releaseMS = 200.0f;
+ float _lastEnv = 0.0f;
+ float _compressionDb = 0.0f;
+
+ Mono() {
+ config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
+ configParam(COMPRESSION_PARAM, 0.0f, 1.0f, 0.2f, "Compression", "", 0.0f, 10.0f);
+ configParam<AmpliferParamQuantity>(LEVEL_PARAM, 0.0f, 1.0f, 1.0f, "Output level");
+ onReset();
+ }
+
+ void sampleRateChange() override;
+ void modulate() override;
+ void processChannel(const ProcessArgs& args, int c) override;
+};
+
+} // namespace bogaudio
diff --git a/src/Pressor.cpp b/src/Pressor.cpp
@@ -155,50 +155,50 @@ void Pressor::processChannel(const ProcessArgs& args, int c) {
}
}
-struct CompressionDisplay : OpaqueWidget {
- struct Level {
- float db;
- NVGcolor color;
- Level(float db, const NVGcolor& color) : db(db), color(color) {}
- };
-
- const NVGcolor bgColor = nvgRGBA(0xaa, 0xaa, 0xaa, 0xff);
- Pressor* _module;
- std::vector<Level> _levels;
-
- CompressionDisplay(Pressor* module) : _module(module) {
- auto color = nvgRGBA(0xff, 0xaa, 0x00, 0xff);
- _levels.push_back(Level(30.0f, color));
- for (int i = 1; i <= 15; ++i) {
- float db = 30.0f - i*2.0f;
- _levels.push_back(Level(db, color)); // decibelsToColor(db - 15.0f)));
+struct PressorWidget : ModuleWidget {
+ struct CompressionDisplay : OpaqueWidget {
+ struct Level {
+ float db;
+ NVGcolor color;
+ Level(float db, const NVGcolor& color) : db(db), color(color) {}
+ };
+
+ const NVGcolor bgColor = nvgRGBA(0xaa, 0xaa, 0xaa, 0xff);
+ Pressor* _module;
+ std::vector<Level> _levels;
+
+ CompressionDisplay(Pressor* module) : _module(module) {
+ auto color = nvgRGBA(0xff, 0xaa, 0x00, 0xff);
+ _levels.push_back(Level(30.0f, color));
+ for (int i = 1; i <= 15; ++i) {
+ float db = 30.0f - i*2.0f;
+ _levels.push_back(Level(db, color)); // decibelsToColor(db - 15.0f)));
+ }
}
- }
- void draw(const DrawArgs& args) override {
- float compressionDb = 0.0f;
- if (_module) {
- compressionDb = _module->_compressionDb;
- }
+ void draw(const DrawArgs& args) override {
+ float compressionDb = 0.0f;
+ if (_module) {
+ compressionDb = _module->_compressionDb;
+ }
- nvgSave(args.vg);
- for (int i = 0; i < 80; i += 5) {
- const Level& l = _levels.at(i / 5);
+ nvgSave(args.vg);
+ for (int i = 0; i < 80; i += 5) {
+ const Level& l = _levels.at(i / 5);
- nvgBeginPath(args.vg);
- nvgRect(args.vg, 3, i + 1, 5, 4);
- nvgFillColor(args.vg, bgColor);
- nvgFill(args.vg);
- if (compressionDb > l.db) {
- nvgFillColor(args.vg, l.color);
+ nvgBeginPath(args.vg);
+ nvgRect(args.vg, 3, i + 1, 5, 4);
+ nvgFillColor(args.vg, bgColor);
nvgFill(args.vg);
+ if (compressionDb > l.db) {
+ nvgFillColor(args.vg, l.color);
+ nvgFill(args.vg);
+ }
}
+ nvgRestore(args.vg);
}
- nvgRestore(args.vg);
- }
-};
+ };
-struct PressorWidget : ModuleWidget {
static constexpr int hp = 15;
PressorWidget(Pressor* module) {
diff --git a/src/bogaudio.cpp b/src/bogaudio.cpp
@@ -32,6 +32,7 @@
#include "Mix1.hpp"
#include "Mix4.hpp"
#include "Mix8.hpp"
+#include "Mono.hpp"
#include "Mult.hpp"
#include "Mute8.hpp"
#include "Noise.hpp"
@@ -123,6 +124,8 @@ void init(rack::Plugin *p) {
p->addModel(modelStack);
p->addModel(modelReftone);
+ p->addModel(modelMono);
+
p->addModel(modelBool);
p->addModel(modelCmp);
p->addModel(modelCVD);
