From c1a276a74f13b3ced0ae28f1516a6fc089236945 Mon Sep 17 00:00:00 2001 From: Holger Wirtz Date: Mon, 14 Feb 2022 14:31:02 +0100 Subject: [PATCH] Moved effects to external library. --- MicroDexed.ino | 14 +++++++------- UI.hpp | 12 ++++++------ third-party/effect_freeverbf/library.properties | 10 ++++++++++ .../effect_freeverbf/src/effect_freeverbf.cpp | 0 .../effect_freeverbf/src/effect_freeverbf.h | 0 .../effect_modulated_delay/library.properties | 10 ++++++++++ .../src/effect_modulated_delay.cpp | 2 -- .../src/effect_modulated_delay.h | 0 third-party/effect_mono_stereo/library.properties | 10 ++++++++++ .../effect_mono_stereo/src/effect_mono_stereo.cpp | 0 .../effect_mono_stereo/src/effect_mono_stereo.h | 0 .../effect_platervbstereo/library.properties | 10 ++++++++++ .../src/effect_platervbstereo.cpp | 0 .../src/effect_platervbstereo.h | 0 third-party/effect_stereo_mono/library.properties | 10 ++++++++++ .../effect_stereo_mono/src/effect_stereo_mono.cpp | 0 .../effect_stereo_mono/src/effect_stereo_mono.h | 0 .../effect_stereo_panorama/library.properties | 10 ++++++++++ .../src/effect_stereo_panorama.cpp | 0 .../src/effect_stereo_panorama.h | 0 third-party/template_mixer/library.properties | 10 ++++++++++ .../template_mixer/src/template_mixer.hpp | 0 22 files changed, 83 insertions(+), 15 deletions(-) create mode 100644 third-party/effect_freeverbf/library.properties rename effect_freeverbf.cpp => third-party/effect_freeverbf/src/effect_freeverbf.cpp (100%) rename effect_freeverbf.h => third-party/effect_freeverbf/src/effect_freeverbf.h (100%) create mode 100644 third-party/effect_modulated_delay/library.properties rename effect_modulated_delay.cpp => third-party/effect_modulated_delay/src/effect_modulated_delay.cpp (99%) rename effect_modulated_delay.h => third-party/effect_modulated_delay/src/effect_modulated_delay.h (100%) create mode 100644 third-party/effect_mono_stereo/library.properties rename effect_mono_stereo.cpp => third-party/effect_mono_stereo/src/effect_mono_stereo.cpp (100%) rename effect_mono_stereo.h => third-party/effect_mono_stereo/src/effect_mono_stereo.h (100%) create mode 100644 third-party/effect_platervbstereo/library.properties rename effect_platervbstereo.cpp => third-party/effect_platervbstereo/src/effect_platervbstereo.cpp (100%) rename effect_platervbstereo.h => third-party/effect_platervbstereo/src/effect_platervbstereo.h (100%) create mode 100644 third-party/effect_stereo_mono/library.properties rename effect_stereo_mono.cpp => third-party/effect_stereo_mono/src/effect_stereo_mono.cpp (100%) rename effect_stereo_mono.h => third-party/effect_stereo_mono/src/effect_stereo_mono.h (100%) create mode 100644 third-party/effect_stereo_panorama/library.properties rename effect_stereo_panorama.cpp => third-party/effect_stereo_panorama/src/effect_stereo_panorama.cpp (100%) rename effect_stereo_panorama.h => third-party/effect_stereo_panorama/src/effect_stereo_panorama.h (100%) create mode 100644 third-party/template_mixer/library.properties rename template_mixer.hpp => third-party/template_mixer/src/template_mixer.hpp (100%) diff --git a/MicroDexed.ino b/MicroDexed.ino index 4beeb4d..51bcb74 100644 --- a/MicroDexed.ino +++ b/MicroDexed.ino @@ -47,15 +47,15 @@ using namespace TeensyTimerTool; #include "midi_devices.hpp" #include "synth_dexed.h" #include "dexed_sd.h" -#include "effect_modulated_delay.h" -#include "effect_stereo_mono.h" -#include "effect_mono_stereo.h" +#include +#include +#include #if defined(USE_PLATEREVERB) -#include "effect_platervbstereo.h" +#include #else -#include "effect_freeverbf.h" +#include #endif -#include "template_mixer.hpp" +#include #include "UI.hpp" #if NUM_DRUMS > 0 #include "drums.h" @@ -66,7 +66,7 @@ using namespace TeensyTimerTool; #endif #if defined (USE_EPIANO) #include "synth_mda_epiano.h" -#include "effect_stereo_panorama.h" +#include #endif // Audio engines diff --git a/UI.hpp b/UI.hpp index e9edcee..7180fac 100644 --- a/UI.hpp +++ b/UI.hpp @@ -31,19 +31,19 @@ #include "config.h" #include "disp_plus.h" #include "synth_dexed.h" -#include "effect_modulated_delay.h" -#include "effect_stereo_mono.h" +#include +#include #if defined(USE_PLATEREVERB) -#include "effect_platervbstereo.h" +#include #else -#include "effect_freeverbf.h" +#include #endif -#include "template_mixer.hpp" +#include #include "drumset.h" #include "sequencer.h" #if defined (USE_EPIANO) #include "synth_mda_epiano.h" -#include "effect_stereo_panorama.h" +#include #endif #define _LCDML_DISP_cols LCD_cols diff --git a/third-party/effect_freeverbf/library.properties b/third-party/effect_freeverbf/library.properties new file mode 100644 index 0000000..fd52404 --- /dev/null +++ b/third-party/effect_freeverbf/library.properties @@ -0,0 +1,10 @@ +name=effect_freeverbf +version=1.0 +author= +maintainer= +sentence= +paragraph= +category=Audio +url= +architectures=teensy,avr +license= diff --git a/effect_freeverbf.cpp b/third-party/effect_freeverbf/src/effect_freeverbf.cpp similarity index 100% rename from effect_freeverbf.cpp rename to third-party/effect_freeverbf/src/effect_freeverbf.cpp diff --git a/effect_freeverbf.h b/third-party/effect_freeverbf/src/effect_freeverbf.h similarity index 100% rename from effect_freeverbf.h rename to third-party/effect_freeverbf/src/effect_freeverbf.h diff --git a/third-party/effect_modulated_delay/library.properties b/third-party/effect_modulated_delay/library.properties new file mode 100644 index 0000000..e729b65 --- /dev/null +++ b/third-party/effect_modulated_delay/library.properties @@ -0,0 +1,10 @@ +name=effect_modulated_delay +version=1.0 +author=Holger Wirtz +maintainer= +sentence=Delayline with input for modulation on index (simple linear interpolation) +paragraph= +category=Audio +url=https://codeberg.org/dcoredump/effect_modulated_delay +architectures=teensy,avr +license=GPL3 diff --git a/effect_modulated_delay.cpp b/third-party/effect_modulated_delay/src/effect_modulated_delay.cpp similarity index 99% rename from effect_modulated_delay.cpp rename to third-party/effect_modulated_delay/src/effect_modulated_delay.cpp index 3fd88c6..9fa63ae 100644 --- a/effect_modulated_delay.cpp +++ b/third-party/effect_modulated_delay/src/effect_modulated_delay.cpp @@ -27,8 +27,6 @@ #include "arm_math.h" #include "effect_modulated_delay.h" -extern config_t configuration; - /******************************************************************/ // Based on; A u d i o E f f e c t D e l a y diff --git a/effect_modulated_delay.h b/third-party/effect_modulated_delay/src/effect_modulated_delay.h similarity index 100% rename from effect_modulated_delay.h rename to third-party/effect_modulated_delay/src/effect_modulated_delay.h diff --git a/third-party/effect_mono_stereo/library.properties b/third-party/effect_mono_stereo/library.properties new file mode 100644 index 0000000..3cd49c4 --- /dev/null +++ b/third-party/effect_mono_stereo/library.properties @@ -0,0 +1,10 @@ +name=effect_mono_stereo +version=1.0 +author= +maintainer= +sentence= +paragraph= +category=Audio +url= +architectures=teensy,avr +license= diff --git a/effect_mono_stereo.cpp b/third-party/effect_mono_stereo/src/effect_mono_stereo.cpp similarity index 100% rename from effect_mono_stereo.cpp rename to third-party/effect_mono_stereo/src/effect_mono_stereo.cpp diff --git a/effect_mono_stereo.h b/third-party/effect_mono_stereo/src/effect_mono_stereo.h similarity index 100% rename from effect_mono_stereo.h rename to third-party/effect_mono_stereo/src/effect_mono_stereo.h diff --git a/third-party/effect_platervbstereo/library.properties b/third-party/effect_platervbstereo/library.properties new file mode 100644 index 0000000..805f0fb --- /dev/null +++ b/third-party/effect_platervbstereo/library.properties @@ -0,0 +1,10 @@ +name=effect_platervbstereo +version=1.0 +author= +maintainer= +sentence= +paragraph= +category=Audio +url= +architectures=teensy,avr +license= diff --git a/effect_platervbstereo.cpp b/third-party/effect_platervbstereo/src/effect_platervbstereo.cpp similarity index 100% rename from effect_platervbstereo.cpp rename to third-party/effect_platervbstereo/src/effect_platervbstereo.cpp diff --git a/effect_platervbstereo.h b/third-party/effect_platervbstereo/src/effect_platervbstereo.h similarity index 100% rename from effect_platervbstereo.h rename to third-party/effect_platervbstereo/src/effect_platervbstereo.h diff --git a/third-party/effect_stereo_mono/library.properties b/third-party/effect_stereo_mono/library.properties new file mode 100644 index 0000000..6b676a6 --- /dev/null +++ b/third-party/effect_stereo_mono/library.properties @@ -0,0 +1,10 @@ +name=effect_stereo_mono +version=1.0 +author= +maintainer= +sentence= +paragraph= +category=Audio +url= +architectures=teensy,avr +license= diff --git a/effect_stereo_mono.cpp b/third-party/effect_stereo_mono/src/effect_stereo_mono.cpp similarity index 100% rename from effect_stereo_mono.cpp rename to third-party/effect_stereo_mono/src/effect_stereo_mono.cpp diff --git a/effect_stereo_mono.h b/third-party/effect_stereo_mono/src/effect_stereo_mono.h similarity index 100% rename from effect_stereo_mono.h rename to third-party/effect_stereo_mono/src/effect_stereo_mono.h diff --git a/third-party/effect_stereo_panorama/library.properties b/third-party/effect_stereo_panorama/library.properties new file mode 100644 index 0000000..5703fab --- /dev/null +++ b/third-party/effect_stereo_panorama/library.properties @@ -0,0 +1,10 @@ +name=effect_stereo_panorama +version=1.0 +author= +maintainer= +sentence= +paragraph= +category=Audio +url= +architectures=teensy,avr +license= diff --git a/effect_stereo_panorama.cpp b/third-party/effect_stereo_panorama/src/effect_stereo_panorama.cpp similarity index 100% rename from effect_stereo_panorama.cpp rename to third-party/effect_stereo_panorama/src/effect_stereo_panorama.cpp diff --git a/effect_stereo_panorama.h b/third-party/effect_stereo_panorama/src/effect_stereo_panorama.h similarity index 100% rename from effect_stereo_panorama.h rename to third-party/effect_stereo_panorama/src/effect_stereo_panorama.h diff --git a/third-party/template_mixer/library.properties b/third-party/template_mixer/library.properties new file mode 100644 index 0000000..d601e66 --- /dev/null +++ b/third-party/template_mixer/library.properties @@ -0,0 +1,10 @@ +name=template_mixer +version=1.0 +author= +maintainer= +sentence= +paragraph= +category=Audio +url= +architectures=teensy,avr +license= diff --git a/template_mixer.hpp b/third-party/template_mixer/src/template_mixer.hpp similarity index 100% rename from template_mixer.hpp rename to third-party/template_mixer/src/template_mixer.hpp