From 16be7bd7d1aaca4ed3fbe5350f128c5045983896 Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 3 Dec 2021 13:26:28 +0000 Subject: [PATCH] Initial push for Aria modules, WIP Signed-off-by: falkTX --- .gitmodules | 3 + plugins/AriaModules | 1 + plugins/Makefile | 17 ++++++ plugins/plugins.cpp | 121 +++++++++++++++++++++++++++++++++------- plugins/res/AriaModules | 1 + 5 files changed, 122 insertions(+), 21 deletions(-) create mode 160000 plugins/AriaModules create mode 120000 plugins/res/AriaModules diff --git a/.gitmodules b/.gitmodules index d94f615..8c06da4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -79,3 +79,6 @@ [submodule "plugins/repelzen"] path = plugins/repelzen url = https://github.com/wiqid/repelzen.git +[submodule "plugins/AriaModules"] + path = plugins/AriaModules + url = https://github.com/CardinalModules/AriaModules.git diff --git a/plugins/AriaModules b/plugins/AriaModules new file mode 160000 index 0000000..0d095aa --- /dev/null +++ b/plugins/AriaModules @@ -0,0 +1 @@ +Subproject commit 0d095aa1aad140f8fa9834c85f689abf5d545abd diff --git a/plugins/Makefile b/plugins/Makefile index 8ed70cb..2599574 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -207,6 +207,16 @@ AMALGAMATEDHARMONICS_CUSTOM += bogaudio PLUGIN_FILES += $(wildcard AnimatedCircuits/src/Folding/*.cpp) +# -------------------------------------------------------------- +# Aria + +ARIA_TODO = Qqqq + +PLUGIN_FILES += $(filter-out AriaModules/src/plugin.cpp $(ARIA_TODO:%=AriaModules/src/%.cpp),$(wildcard AriaModules/src/*.cpp)) + +# modules/types which are present in other plugins +ARIA_CUSTOM = Blank + # -------------------------------------------------------------- # AS @@ -775,6 +785,13 @@ $(BUILD_DIR)/AnimatedCircuits/%.cpp.o: AnimatedCircuits/%.cpp $(foreach m,$(ANIMATEDCIRCUITS_CUSTOM),$(call custom_module_names,$(m),AnimatedCircuits)) \ -DpluginInstance=pluginInstance__AnimatedCircuits +$(BUILD_DIR)/AriaModules/%.cpp.o: AriaModules/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(ARIA_CUSTOM),$(call custom_module_names,$(m),Aria)) \ + -DpluginInstance=pluginInstance__Aria + $(BUILD_DIR)/AS/%.cpp.o: AS/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 16071ad..611ef22 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -30,6 +30,36 @@ // AnimatedCircuits #include "AnimatedCircuits/src/plugin.hpp" +// Aria +/* NOTE too much noise in original include, do this a different way +// #include "AriaModules/src/plugin.hpp" +*/ +#define modelBlank modelAriaBlank +extern Model *modelSplort; +extern Model *modelSmerge; +extern Model *modelSpleet; +extern Model *modelSwerge; +extern Model *modelSplirge; +// extern Model *modelSrot; +extern Model *modelQqqq; +extern Model *modelQuack; +extern Model *modelQ; +extern Model *modelQuale; +extern Model *modelDarius; +extern Model *modelSolomon4; +extern Model *modelSolomon8; +extern Model *modelSolomon16; +extern Model *modelArcane; +extern Model *modelAtout; +extern Model *modelAleister; +extern Model *modelPsychopump; +extern Model *modelPokies4; +extern Model *modelGrabby; +extern Model *modelRotatoes4; +extern Model *modelUndular; +extern Model *modelBlank; +#undef modelBlank + // AS #define modelADSR modelASADSR #define modelVCA modelASVCA @@ -327,6 +357,7 @@ Plugin* pluginInstance__Cardinal; #ifndef NOPLUGINS Plugin* pluginInstance__AmalgamatedHarmonics; Plugin* pluginInstance__AnimatedCircuits; +Plugin* pluginInstance__Aria; Plugin* pluginInstance__AS; Plugin* pluginInstance__Atelier; Plugin* pluginInstance__AudibleInstruments; @@ -429,6 +460,29 @@ struct StaticPluginLoader { { return rootJ != nullptr; } + + void removeModule(const char* const slugToRemove) const noexcept + { + json_t* const modules = json_object_get(rootJ, "modules"); + DISTRHO_SAFE_ASSERT_RETURN(modules != nullptr,); + + size_t i; + json_t* v; + json_array_foreach(modules, i, v) + { + if (json_t* const slug = json_object_get(v, "slug")) + { + if (const char* const value = json_string_value(slug)) + { + if (std::strcmp(value, slugToRemove) == 0) + { + json_array_remove(modules, i); + break; + } + } + } + } + } }; static void initStatic__Core() @@ -516,6 +570,50 @@ static void initStatic__AnimatedCircuits() } } +static void initStatic__Aria() +{ + Plugin* const p = new Plugin; + pluginInstance__Aria = p; + + const StaticPluginLoader spl(p, "AriaModules"); + if (spl.ok()) + { +#define modelBlank modelAriaBlank + p->addModel(modelSplort); + p->addModel(modelSmerge); + p->addModel(modelSpleet); + p->addModel(modelSwerge); + p->addModel(modelSplirge); + // p->addModel(modelSrot); + /* TODO needs quickjs + p->addModel(modelQqqq); + p->addModel(modelQuack); + p->addModel(modelQ); + p->addModel(modelQuale); + */ + p->addModel(modelDarius); + p->addModel(modelSolomon4); + p->addModel(modelSolomon8); + p->addModel(modelSolomon16); + p->addModel(modelArcane); + p->addModel(modelAtout); + p->addModel(modelAleister); + p->addModel(modelPsychopump); + p->addModel(modelPokies4); + p->addModel(modelGrabby); + p->addModel(modelRotatoes4); + p->addModel(modelUndular); + p->addModel(modelBlank); +#undef modelBlank + // NOTE disabled in Cardinal due to curl usage + // TODO finalize this + spl.removeModule("Qqqq"); + spl.removeModule("Quack"); + spl.removeModule("Q"); + spl.removeModule("Quale"); + } +} + static void initStatic__AS() { Plugin* const p = new Plugin; @@ -711,27 +809,7 @@ static void initStatic__Bidoo() // NOTE disabled in Cardinal due to curl usage // p->addModel(modelANTN); - - // intentionally remove known bad plugin - if (json_t* const modules = json_object_get(spl.rootJ, "modules")) - { - size_t i; - json_t* v; - json_array_foreach(modules, i, v) - { - if (json_t* const slug = json_object_get(v, "slug")) - { - if (const char* const value = json_string_value(slug)) - { - if (std::strcmp(value, "antN") == 0) - { - json_array_remove(modules, i); - break; - } - } - } - } - } + spl.removeModule("antN"); } } @@ -1289,6 +1367,7 @@ void initStaticPlugins() #ifndef NOPLUGINS initStatic__AmalgamatedHarmonics(); initStatic__AnimatedCircuits(); + initStatic__Aria(); initStatic__AS(); initStatic__Atelier(); initStatic__AudibleInstruments(); diff --git a/plugins/res/AriaModules b/plugins/res/AriaModules new file mode 120000 index 0000000..eaaeefa --- /dev/null +++ b/plugins/res/AriaModules @@ -0,0 +1 @@ +../AriaModules/res/ \ No newline at end of file