From a5242a4c581587da892a53c1a8140aa6d5c6bdc8 Mon Sep 17 00:00:00 2001 From: Jim Tupper Date: Wed, 31 Oct 2018 22:38:44 +0000 Subject: [PATCH] Bumping to v0.6.4 Using Steve Baker's original skin for the Audio16 module --- Makefile | 2 +- README.md | 13 +- ...ace16.svg => AudioInterface16_Plastic.svg} | 0 res/AudioInterface16_SB.svg | 120 ++++++++++++++++++ src/AudioInterface16.cpp | 20 ++- 5 files changed, 136 insertions(+), 19 deletions(-) rename res/{AudioInterface16.svg => AudioInterface16_Plastic.svg} (100%) create mode 100644 res/AudioInterface16_SB.svg diff --git a/Makefile b/Makefile index c652351..77157ba 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ SLUG = rcm # Must follow the format in the Versioning section of # https://vcvrack.com/manual/PluginDevelopmentTutorial.html -VERSION = 0.6.3 +VERSION = 0.6.4 # FLAGS will be passed to both the C and C++ compiler #FLAGS += -Idep/openmpt-libopenmpt-0.3.10/soundlib -Idep/openmpt-libopenmpt-0.3.10/common diff --git a/README.md b/README.md index 5aa738b..7b7002e 100644 --- a/README.md +++ b/README.md @@ -15,16 +15,7 @@ The Spread feature cannot be modified without recreating the engine, so it's fix The output is normalised using an internal envelope following, because the output gets crazy high voltages otherwise. This follower can generate its own effects at times when things are out of hand. -## Duck +## Audio 16 -A basic audio ducking module. - -Takes 2 stereo inputs: - -* over input is the audio that gets overlaid. -* under input is the base audio stream that gets ducked. - -There is a single stereo output that contains the result of the ducking operation. - -The tunables aren't CV'd since they don't seem to be generic - once you get your sound they tend to stay fixed. I may change this, but it would result in a wider module to accomadate the patching bay. +Steve Baker's version of the Audio module that supports audio devices with up to 16 inputs and outputs. diff --git a/res/AudioInterface16.svg b/res/AudioInterface16_Plastic.svg similarity index 100% rename from res/AudioInterface16.svg rename to res/AudioInterface16_Plastic.svg diff --git a/res/AudioInterface16_SB.svg b/res/AudioInterface16_SB.svg new file mode 100644 index 0000000..cf789fe --- /dev/null +++ b/res/AudioInterface16_SB.svg @@ -0,0 +1,120 @@ + + AudioInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/AudioInterface16.cpp b/src/AudioInterface16.cpp index 7255b4d..06d0c89 100644 --- a/src/AudioInterface16.cpp +++ b/src/AudioInterface16.cpp @@ -243,13 +243,17 @@ void AudioInterface16::step() { struct AudioInterfaceWidget16 : ModuleWidget { + SVGWidget* backgroundPanel; + std::shared_ptr background_SB; + std::shared_ptr background_Plastic; + AudioInterfaceWidget16(AudioInterface16 *module) : ModuleWidget(module) { - setPanel(SVG::load(assetPlugin(plugin, "res/AudioInterface16.svg"))); + setPanel(SVG::load(assetPlugin(plugin, "res/AudioInterface16_SB.svg"))); - // addChild(Widget::create(Vec(RACK_GRID_WIDTH, 0))); - // addChild(Widget::create(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0))); - // addChild(Widget::create(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH))); - // addChild(Widget::create(Vec(box.size.x - 2 * RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH))); + addChild(Widget::create(Vec(RACK_GRID_WIDTH, 0))); + addChild(Widget::create(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0))); + addChild(Widget::create(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH))); + addChild(Widget::create(Vec(box.size.x - 2 * RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH))); addInput(Port::create(mm2px(Vec(3.7069211, 55.530807)), Port::INPUT, module, AudioInterface16::AUDIO_INPUT + 0)); addInput(Port::create(mm2px(Vec(15.307249, 55.530807)), Port::INPUT, module, AudioInterface16::AUDIO_INPUT + 1)); @@ -303,12 +307,14 @@ struct AudioInterfaceWidget16 : ModuleWidget { addChild(ModuleLightWidget::create>(mm2px(Vec(58.926309, 107.17003)), module, AudioInterface16::OUTPUT_LIGHT + 6)); addChild(ModuleLightWidget::create>(mm2px(Vec(82.126971, 107.17003)), module, AudioInterface16::OUTPUT_LIGHT + 7)); - AudioWidget *audioWidget = Widget::create(mm2px(Vec(3.2122073, 10.837339))); + AudioWidget* audioWidget = Widget::create(mm2px(Vec(3.2122073, 14.837339))); audioWidget->box.size = mm2px(Vec(90.5, 28)); audioWidget->audioIO = &module->audioIO; addChild(audioWidget); } + + }; -Model *modelAudioInterface16 = Model::create("rcm", "AudioInterface16", "Audio 16", EXTERNAL_TAG); \ No newline at end of file +Model *modelAudioInterface16 = Model::create("rcm", "AudioInterface16", "Audio 16", EXTERNAL_TAG);