commit 289d31889b9668d415cef587e1cf5531fb5c3ea1
parent f26b74d0bcb5b667d8b9b65b325f9ac748fb7c80
Author: Matt Demanett <matt@demanett.net>
Date: Wed, 9 May 2018 23:31:24 -0400
Stereo panner module.
Diffstat:
8 files changed, 309 insertions(+), 0 deletions(-)
diff --git a/benchmarks/signal_benchmark.cpp b/benchmarks/signal_benchmark.cpp
@@ -152,3 +152,40 @@ static void BM_SlewLimiter_Slow(benchmark::State& state) {
}
}
BENCHMARK(BM_SlewLimiter_Slow);
+
+static void BM_Panner(benchmark::State& state) {
+ SineOscillator o(500.0, 100.0);
+ const int n = 256;
+ float buf[n];
+ for (int i = 0; i < n; ++i) {
+ buf[i] = o.next() * 5.0f;
+ }
+ Panner p;
+ int i = 0;
+ float l, r;
+ for (auto _ : state) {
+ i = ++i % n;
+ p.next(buf[i], l, r);
+ }
+}
+BENCHMARK(BM_Panner);
+
+static void BM_Panner_Modulating(benchmark::State& state) {
+ SineOscillator o(500.0, 100.0);
+ const int n = 256;
+ float buf[n];
+ for (int i = 0; i < n; ++i) {
+ buf[i] = o.next() * 5.0f;
+ }
+ std::minstd_rand g;
+ std::uniform_real_distribution<float> r(-1.0f, 1.0f);
+ Panner p;
+ int i = 0;
+ float l, rr;
+ for (auto _ : state) {
+ i = ++i % n;
+ p.setPan(r(g));
+ p.next(buf[i], l, rr);
+ }
+}
+BENCHMARK(BM_Panner_Modulating);
diff --git a/res-src/Pan-src.svg b/res-src/Pan-src.svg
@@ -0,0 +1,114 @@
+<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="knobguide-panner" 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(-1.8 2)">L</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 3.5,0" stroke-width="1.0" 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)" />
+ <text font-size="5.0pt" transform="rotate(60) translate(18 0) rotate(-60) translate(-2.1 2)">R</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="22.5,0 22.5,380" stroke-width="0.5" stroke="#0f0" /> -->
+ <!-- <rect width="45" height="10" fill="#0f0" transform="translate(0 68)" /> -->
+ <!-- <rect width="45" height="10" fill="#0f0" transform="translate(0 127)" /> -->
+ <!-- <rect width="45" height="10" fill="#0f0" transform="translate(0 177)" /> -->
+
+ <g transform="rotate(-90) translate(-376 13)">
+ <text class="title" font-size="7pt" letter-spacing="2.5px">PAN</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 15)">
+ <use id="PAN1_PARAM" xlink:href="#knob" transform="translate(0 0)" />
+ <use xlink:href="#knobguide-panner" transform="translate(0 0)" />
+ <g transform="translate(5.5 44)">
+ <rect width="34" height="73" rx="5" fill="#fafafa" />
+ <use id="CV1_INPUT" xlink:href="#input" transform="translate(5 3)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(11 35)">CV</text>
+ <use id="IN1_INPUT" xlink:href="#input" transform="translate(5 38)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(12.5 70)">IN</text>
+ </g>
+ </g>
+
+ <g transform="translate(0 138)">
+ <use id="PAN2_PARAM" xlink:href="#knob" transform="translate(0 0)" />
+ <use xlink:href="#knobguide-panner" transform="translate(0 0)" />
+ <g transform="translate(5.5 44)">
+ <rect width="34" height="73" rx="5" fill="#fafafa" />
+ <use id="CV2_INPUT" xlink:href="#input" transform="translate(5 3)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(11 35)">CV</text>
+ <use id="IN2_INPUT" xlink:href="#input" transform="translate(5 38)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(12.5 70)">IN</text>
+ </g>
+ </g>
+
+ <g transform="translate(5.5 265)">
+ <rect width="34" height="73" rx="5" fill="#bbb" />
+ <use id="L_OUTPUT" xlink:href="#output" transform="translate(5 3)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(15 35)">L</text>
+ <use id="R_OUTPUT" xlink:href="#output" transform="translate(5 38)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(15 70)">R</text>
+ </g>
+</svg>
diff --git a/res/Pan.svg b/res/Pan.svg
Binary files differ.
diff --git a/src/Pan.cpp b/src/Pan.cpp
@@ -0,0 +1,74 @@
+
+#include "Pan.hpp"
+
+void Pan::onSampleRateChange() {
+ _slew1.setParams(engineGetSampleRate(), 2.0f);
+ _slew2.setParams(engineGetSampleRate(), 2.0f);
+}
+
+void Pan::step() {
+ if (!((inputs[IN1_INPUT].active || inputs[IN2_INPUT].active) && (outputs[L_OUTPUT].active || outputs[R_OUTPUT].active))) {
+ return;
+ }
+
+ float pan = params[PAN1_PARAM].value;
+ if (inputs[CV1_INPUT].active) {
+ pan *= clamp(inputs[CV1_INPUT].value / 5.0f, -1.0f, 1.0f);
+ }
+ _panner1.setPan(_slew1.next(pan));
+
+ pan = params[PAN2_PARAM].value;
+ if (inputs[CV2_INPUT].active) {
+ pan *= clamp(inputs[CV2_INPUT].value / 5.0f, -1.0f, 1.0f);
+ }
+ _panner2.setPan(_slew2.next(pan));
+
+ float l1 = 0.0f, r1 = 0.0f;
+ _panner1.next(inputs[IN1_INPUT].value, l1, r1);
+ float l2 = 0.0f, r2 = 0.0f;
+ _panner2.next(inputs[IN2_INPUT].value, l2, r2);
+ outputs[L_OUTPUT].value = l1 + l2;
+ outputs[R_OUTPUT].value = r1 + r2;
+}
+
+struct PanWidget : ModuleWidget {
+ PanWidget(Pan* 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/Pan.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 pan1ParamPosition = Vec(9.5, 24.5);
+ auto pan2ParamPosition = Vec(9.5, 147.5);
+
+ auto cv1InputPosition = Vec(10.5, 62.0);
+ auto in1InputPosition = Vec(10.5, 97.0);
+ auto cv2InputPosition = Vec(10.5, 185.0);
+ auto in2InputPosition = Vec(10.5, 220.0);
+
+ auto lOutputPosition = Vec(10.5, 268.0);
+ auto rOutputPosition = Vec(10.5, 303.0);
+ // end generated by svg_widgets.rb
+
+ addParam(ParamWidget::create<Knob26>(pan1ParamPosition, module, Pan::PAN1_PARAM, -1.0, 1.0, 0.0));
+ addParam(ParamWidget::create<Knob26>(pan2ParamPosition, module, Pan::PAN2_PARAM, -1.0, 1.0, 0.0));
+
+ addInput(Port::create<Port24>(cv1InputPosition, Port::INPUT, module, Pan::CV1_INPUT));
+ addInput(Port::create<Port24>(in1InputPosition, Port::INPUT, module, Pan::IN1_INPUT));
+ addInput(Port::create<Port24>(cv2InputPosition, Port::INPUT, module, Pan::CV2_INPUT));
+ addInput(Port::create<Port24>(in2InputPosition, Port::INPUT, module, Pan::IN2_INPUT));
+
+ addOutput(Port::create<Port24>(lOutputPosition, Port::OUTPUT, module, Pan::L_OUTPUT));
+ addOutput(Port::create<Port24>(rOutputPosition, Port::OUTPUT, module, Pan::R_OUTPUT));
+ }
+};
+
+Model* modelPan = Model::create<Pan, PanWidget>("Bogaudio", "Bogaudio-Pan", "Pan", PANNING_TAG, DUAL_TAG, UTILITY_TAG);
diff --git a/src/Pan.hpp b/src/Pan.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "bogaudio.hpp"
+#include "dsp/signal.hpp"
+
+using namespace bogaudio::dsp;
+
+extern Model* modelPan;
+
+namespace bogaudio {
+
+struct Pan : Module {
+ enum ParamsIds {
+ PAN1_PARAM,
+ PAN2_PARAM,
+ NUM_PARAMS
+ };
+
+ enum InputsIds {
+ CV1_INPUT,
+ IN1_INPUT,
+ CV2_INPUT,
+ IN2_INPUT,
+ NUM_INPUTS
+ };
+
+ enum OutputsIds {
+ L_OUTPUT,
+ R_OUTPUT,
+ NUM_OUTPUTS
+ };
+
+ enum LightsIds {
+ NUM_LIGHTS
+ };
+
+ Panner _panner1;
+ Panner _panner2;
+ SlewLimiter _slew1;
+ SlewLimiter _slew2;
+
+ Pan() : 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
@@ -26,6 +26,7 @@
#include "Mult.hpp"
#include "Noise.hpp"
#include "Offset.hpp"
+#include "Pan.hpp"
#include "Reftone.hpp"
#include "SampleHold.hpp"
#include "Stack.hpp"
@@ -84,6 +85,9 @@ void init(rack::Plugin *p) {
#endif
p->addModel(modelNoise);
p->addModel(modelOffset);
+#ifdef EXPERIMENTAL
+ p->addModel(modelPan);
+#endif
p->addModel(modelReftone);
p->addModel(modelSampleHold);
p->addModel(modelStack);
diff --git a/src/dsp/signal.cpp b/src/dsp/signal.cpp
@@ -210,3 +210,19 @@ void CrossFader::setMix(float mix) {
float CrossFader::next(float a, float b) {
return _aMix * a + _bMix * b;
}
+
+
+void Panner::setPan(float pan) {
+ assert(pan >= -1.0f);
+ assert(pan <= 1.0f);
+ if (_pan != pan) {
+ _pan = pan;
+ _lLevel = _sineTable.value(((1.0f + _pan) / 8.0f + 0.25f) * _sineTable.length());
+ _rLevel = _sineTable.value(((1.0f + _pan) / 8.0f) * _sineTable.length());
+ }
+}
+
+void Panner::next(float sample, float& l, float& r) {
+ l = _lLevel * sample;
+ r = _rLevel * sample;
+}
diff --git a/src/dsp/signal.hpp b/src/dsp/signal.hpp
@@ -134,5 +134,19 @@ struct CrossFader {
float next(float a, float b);
};
+struct Panner {
+ float _pan = 2.0f;
+ float _lLevel = 0.0f;
+ float _rLevel = 0.0f;
+ const Table& _sineTable;
+
+ Panner() : _sineTable(StaticSineTable::table()) {
+ setPan(0.0f);
+ }
+
+ void setPan(float pan); // -1.0 full left, 0.0 even, 1.0f full right.
+ void next(float sample, float& l, float& r);
+};
+
} // namespace dsp
} // namespace bogaudio
