From 8d5bd3dd5b54e9410ec9aa0deba0d68c89b81cd8 Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 26 Jan 2023 13:40:40 +0100 Subject: [PATCH] Mini: Add Fundamental MidSide and Sum, replace Braids with Ripples Signed-off-by: falkTX --- dpf | 2 +- plugins/Makefile | 18 ++++++++++-------- plugins/plugins-mini.cpp | 10 +++++----- plugins/todo.txt | 10 ---------- 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/dpf b/dpf index 54e1fb8..b4b0c7c 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 54e1fb847d046f97b23b94d9c002efe29b3a4240 +Subproject commit b4b0c7c67e48d5ca48a7d0d6a4d05b17e6c1d707 diff --git a/plugins/Makefile b/plugins/Makefile index 909b36d..6354502 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -314,11 +314,13 @@ PLUGIN_FILES += Fundamental/src/dr_wav.c MINIPLUGIN_FILES += Fundamental/src/ADSR.cpp MINIPLUGIN_FILES += Fundamental/src/LFO.cpp MINIPLUGIN_FILES += Fundamental/src/Merge.cpp +MINIPLUGIN_FILES += Fundamental/src/MidSide.cpp MINIPLUGIN_FILES += Fundamental/src/Noise.cpp MINIPLUGIN_FILES += Fundamental/src/Quantizer.cpp MINIPLUGIN_FILES += Fundamental/src/Random.cpp MINIPLUGIN_FILES += Fundamental/src/Scope.cpp MINIPLUGIN_FILES += Fundamental/src/Split.cpp +MINIPLUGIN_FILES += Fundamental/src/Sum.cpp MINIPLUGIN_FILES += Fundamental/src/VCA-1.cpp MINIPLUGIN_FILES += Fundamental/src/VCF.cpp MINIPLUGIN_FILES += Fundamental/src/VCMixer.cpp @@ -535,13 +537,13 @@ PLUGIN_FILES += AudibleInstruments/eurorack/streams/svf.cc PLUGIN_FILES += AudibleInstruments/eurorack/streams/vactrol.cc PLUGIN_FILES += AudibleInstruments/eurorack/streams/compressor.cc -MINIPLUGIN_FILES += AudibleInstruments/src/Braids.cpp MINIPLUGIN_FILES += AudibleInstruments/src/Plaits.cpp -MINIPLUGIN_FILES += AudibleInstruments/eurorack/braids/macro_oscillator.cc -MINIPLUGIN_FILES += AudibleInstruments/eurorack/braids/analog_oscillator.cc -MINIPLUGIN_FILES += AudibleInstruments/eurorack/braids/digital_oscillator.cc -MINIPLUGIN_FILES += AudibleInstruments/eurorack/braids/quantizer.cc -MINIPLUGIN_FILES += AudibleInstruments/eurorack/braids/resources.cc +MINIPLUGIN_FILES += AudibleInstruments/src/Ripples.cpp +# MINIPLUGIN_FILES += AudibleInstruments/eurorack/braids/macro_oscillator.cc +# MINIPLUGIN_FILES += AudibleInstruments/eurorack/braids/analog_oscillator.cc +# MINIPLUGIN_FILES += AudibleInstruments/eurorack/braids/digital_oscillator.cc +# MINIPLUGIN_FILES += AudibleInstruments/eurorack/braids/quantizer.cc +# MINIPLUGIN_FILES += AudibleInstruments/eurorack/braids/resources.cc MINIPLUGIN_FILES += $(wildcard AudibleInstruments/eurorack/plaits/dsp/*.cc) MINIPLUGIN_FILES += $(wildcard AudibleInstruments/eurorack/plaits/dsp/engine/*.cc) MINIPLUGIN_FILES += $(wildcard AudibleInstruments/eurorack/plaits/dsp/speech/*.cc) @@ -1514,9 +1516,9 @@ MINIRESOURCE_FILES += AriaModules/res/faceplates/Spleet.svg MINIRESOURCE_FILES += AriaModules/res/faceplates/Swerge.svg MINIRESOURCE_FILES += AriaModules/res/signature/signature.svg -MINIRESOURCE_FILES += AudibleInstruments/res/Braids.svg MINIRESOURCE_FILES += AudibleInstruments/res/Plaits.svg -MINIRESOURCE_FILES += AudibleInstruments/res/hdad-segment14-1.002/Segment14.ttf +MINIRESOURCE_FILES += AudibleInstruments/res/Ripples.svg +# MINIRESOURCE_FILES += AudibleInstruments/res/hdad-segment14-1.002/Segment14.ttf # MINIRESOURCE_FILES += BogaudioModules/res/AD-dark.svg # MINIRESOURCE_FILES += BogaudioModules/res/AD.svg diff --git a/plugins/plugins-mini.cpp b/plugins/plugins-mini.cpp index 8f7dabe..1540cc0 100644 --- a/plugins/plugins-mini.cpp +++ b/plugins/plugins-mini.cpp @@ -1,6 +1,6 @@ /* * DISTRHO Cardinal Plugin - * Copyright (C) 2021-2022 Filipe Coelho + * Copyright (C) 2021-2023 Filipe Coelho * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -230,11 +230,13 @@ static void initStatic__Fundamental() p->addModel(modelADSR); p->addModel(modelLFO); p->addModel(modelMerge); + p->addModel(modelMidSide); p->addModel(modelNoise); p->addModel(modelQuantizer); p->addModel(modelRandom); p->addModel(modelScope); p->addModel(modelSplit); + p->addModel(modelSum); p->addModel(modelVCA_1); p->addModel(modelVCF); p->addModel(modelVCMixer); @@ -242,7 +244,6 @@ static void initStatic__Fundamental() spl.removeModule("8vert"); spl.removeModule("Delay"); spl.removeModule("LFO2"); - spl.removeModule("MidSide"); spl.removeModule("Mixer"); spl.removeModule("Mutes"); spl.removeModule("Octave"); @@ -250,7 +251,6 @@ static void initStatic__Fundamental() spl.removeModule("SEQ3"); spl.removeModule("SequentialSwitch1"); spl.removeModule("SequentialSwitch2"); - spl.removeModule("Sum"); spl.removeModule("VCA"); spl.removeModule("VCO2"); } @@ -299,10 +299,11 @@ static void initStatic__AudibleInstruments() const StaticPluginLoader spl(p, "AudibleInstruments"); if (spl.ok()) { - p->addModel(modelBraids); p->addModel(modelPlaits); + p->addModel(modelRipples); spl.removeModule("Blinds"); + spl.removeModule("Braids"); spl.removeModule("Branches"); spl.removeModule("Clouds"); spl.removeModule("Elements"); @@ -311,7 +312,6 @@ static void initStatic__AudibleInstruments() spl.removeModule("Links"); spl.removeModule("Marbles"); spl.removeModule("Rings"); - spl.removeModule("Ripples"); spl.removeModule("Shades"); spl.removeModule("Shelves"); spl.removeModule("Stages"); diff --git a/plugins/todo.txt b/plugins/todo.txt index 2735250..a2e8434 100644 --- a/plugins/todo.txt +++ b/plugins/todo.txt @@ -8,15 +8,9 @@ VultModulesFree 61804.0 (not opensource?) NYSTHI 58494.0 (not opensource?) -ML_modules 55847.0 -https://github.com/martin-lueders/ML_modules/ - FrozenWasteland 53690.0 (GPL-3.0-only) https://github.com/almostEric/FrozenWasteland/ -ArableInstruments 48756.0 -https://github.com/adbrant/ArableInstruments/ - squinkylabs-plug1 48682.0 https://github.com/squinkylabs/SquinkyVCV @@ -28,14 +22,12 @@ https://github.com/MarcBoule/Geodesics Alikins 41798.0 https://github.com/alikins/Alikins-rack-plugins -dBiz 40849.0 RJModules 39972.0 DHE-Modules 39582.0 AlrightDevices 38307.0 SynthKit 38228.0 SubmarineFree 38146.0 Hora-treasureFree 37847.0 -ParableInstruments 37781.0 CountModula 37759.0 MSM 37337.0 CharredDesert 36813.0 @@ -45,10 +37,8 @@ Autinn 34990.0 trowaSoft 34946.0 Hora-VCO_VCF_VCA_Free 34770.0 moDllz 34368.0 -21kHz 34172.0 Ohmer 33950.0 modular80 33447.0 -Autodafe-DrumKit 33143.0 Koralfx-Modules 33035.0 alto777_LFSR 32872.0 StellareModular 32526.0