From 372f30b3e9b3fb85eebdca2f97547d3d73ad742f Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 11 Nov 2021 15:52:45 +0000 Subject: [PATCH] Add Atelier plugins Signed-off-by: falkTX --- .gitmodules | 3 +++ plugins/Atelier | 1 + plugins/Makefile | 26 ++++++++++++++++++++++++++ plugins/plugins.cpp | 17 +++++++++++++++++ plugins/res/Atelier | 1 + 5 files changed, 48 insertions(+) create mode 160000 plugins/Atelier create mode 120000 plugins/res/Atelier diff --git a/.gitmodules b/.gitmodules index 9cb1b28..364a167 100644 --- a/.gitmodules +++ b/.gitmodules @@ -67,3 +67,6 @@ [submodule "carla"] path = carla url = https://github.com/falkTX/Carla.git +[submodule "plugins/Atelier"] + path = plugins/Atelier + url = git@github.com:Xenakios/Atelier.git diff --git a/plugins/Atelier b/plugins/Atelier new file mode 160000 index 0000000..33e4394 --- /dev/null +++ b/plugins/Atelier @@ -0,0 +1 @@ +Subproject commit 33e43948b8c820866a0cc63e04604cd27833f9ee diff --git a/plugins/Makefile b/plugins/Makefile index 99bbee7..0d72384 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -213,6 +213,22 @@ PLUGIN_FILES += AS/freeverb/revmodel.cpp # modules/types which are present in other plugins AS_CUSTOM = ADSR LabelDisplayWidget LowFrequencyOscillator VCA allpass comb revmodel +# -------------------------------------------------------------- +# Atelier + +PLUGIN_FILES += Atelier/src/Palette.cpp +PLUGIN_FILES += Atelier/eurorack/stmlib/dsp/atan.cc +PLUGIN_FILES += Atelier/eurorack/stmlib/dsp/units.cc +PLUGIN_FILES += Atelier/eurorack/stmlib/utils/random.cc +PLUGIN_FILES += $(wildcard Atelier/eurorack/plaits/dsp/*.cc) +PLUGIN_FILES += $(wildcard Atelier/eurorack/plaits/dsp/engine/*.cc) +PLUGIN_FILES += $(wildcard Atelier/eurorack/plaits/dsp/speech/*.cc) +PLUGIN_FILES += $(wildcard Atelier/eurorack/plaits/dsp/physical_modelling/*.cc) +PLUGIN_FILES += Atelier/eurorack/plaits/resources.cc + +# modules/types which are present in other plugins +ATELIER_CUSTOM = plaits stmlib + # -------------------------------------------------------------- # AudibleInstruments @@ -723,6 +739,16 @@ $(BUILD_DIR)/AS/%.cpp.o: AS/%.cpp $(foreach m,$(AS_CUSTOM),$(call custom_module_names,$(m),AS)) \ -DpluginInstance=pluginInstance__AS +$(BUILD_DIR)/Atelier/%.o: Atelier/% + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(ATELIER_CUSTOM),$(call custom_module_names,$(m),Atelier)) \ + -DpluginInstance=pluginInstance__Atelier \ + -DTEST \ + -IAtelier/eurorack \ + -Wno-unused-local-typedefs + $(BUILD_DIR)/AudibleInstruments/%.cc.o: AudibleInstruments/%.cc -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 27c0c45..6aadd5b 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -36,6 +36,9 @@ #undef modelADSR #undef modelVCA +// Atelier +#include "Atelier/src/plugin.hpp" + // AudibleInstruments #include "AudibleInstruments/src/plugin.hpp" @@ -276,6 +279,7 @@ Plugin* pluginInstance__Cardinal; Plugin* pluginInstance__AmalgamatedHarmonics; Plugin* pluginInstance__AnimatedCircuits; Plugin* pluginInstance__AS; +Plugin* pluginInstance__Atelier; Plugin* pluginInstance__AudibleInstruments; Plugin* pluginInstance__Befaco; Plugin* pluginInstance__Bidoo; @@ -525,6 +529,18 @@ static void initStatic__AS() } } +static void initStatic__Atelier() +{ + Plugin* const p = new Plugin; + pluginInstance__Atelier = p; + + const StaticPluginLoader spl(p, "Atelier"); + if (spl.ok()) + { + p->addModel(modelPalette); + } +} + static void initStatic__AudibleInstruments() { Plugin* const p = new Plugin; @@ -1125,6 +1141,7 @@ void initStaticPlugins() initStatic__AmalgamatedHarmonics(); initStatic__AnimatedCircuits(); initStatic__AS(); + initStatic__Atelier(); initStatic__AudibleInstruments(); initStatic__Befaco(); initStatic__Bidoo(); diff --git a/plugins/res/Atelier b/plugins/res/Atelier new file mode 120000 index 0000000..0c7e7bc --- /dev/null +++ b/plugins/res/Atelier @@ -0,0 +1 @@ +../Atelier/res \ No newline at end of file