diff --git a/.gitmodules b/.gitmodules index 1120180..c310164 100644 --- a/.gitmodules +++ b/.gitmodules @@ -124,3 +124,6 @@ [submodule "deps/PawPaw"] path = deps/PawPaw url = https://github.com/DISTRHO/PawPaw.git +[submodule "plugins/LomasModules"] + path = plugins/LomasModules + url = https://github.com/LomasModules/LomasModules.git diff --git a/README.md b/README.md index 24c0ade..ed359fd 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,8 @@ At the moment the following 3rd-party modules are provided: - JW-Modules - LifeFormModular - Little Utils -- LyraeModules +- Lomas Modules +- Lyrae Modules - MindMeld - Mog - mscHack diff --git a/doc/LICENSES.md b/doc/LICENSES.md index e73d3c7..4404fcb 100644 --- a/doc/LICENSES.md +++ b/doc/LICENSES.md @@ -38,7 +38,8 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule | JW-Modules | BSD-3-Clause | | | LifeFormModular | MIT | | | Little Utils | MIT | | -| LyraeModules | GPL-3.0-or-later | | +| Lomas Modules | GPL-3.0-or-later | | +| Lyrae Modules | GPL-3.0-or-later | | | MindMeld | GPL-3.0-or-later | | | Mog | CC0-1.0 | | | mscHack | BSD-3-Clause | | diff --git a/plugins/LomasModules b/plugins/LomasModules new file mode 160000 index 0000000..b1e8edf --- /dev/null +++ b/plugins/LomasModules @@ -0,0 +1 @@ +Subproject commit b1e8edf1e11e2f725b8f27c8091613f9eda86e37 diff --git a/plugins/Makefile b/plugins/Makefile index ef33470..e644a4c 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -500,6 +500,11 @@ PLUGIN_FILES += $(filter-out LittleUtils/src/plugin.cpp,$(wildcard LittleUtils/s # modules/types which are present in other plugins LITTLEUTILS_CUSTOM = MsDisplayWidget +# -------------------------------------------------------------- +# LomasModules + +PLUGIN_FILES += $(filter-out LomasModules/src/plugin.cpp,$(wildcard LomasModules/src/*.cpp)) + # -------------------------------------------------------------- # LyraeModules @@ -1140,6 +1145,13 @@ $(BUILD_DIR)/LittleUtils/%.cpp.o: LittleUtils/%.cpp $(foreach m,$(LITTLEUTILS_CUSTOM),$(call custom_module_names,$(m),LittleUtils)) \ -DpluginInstance=pluginInstance__LittleUtils +$(BUILD_DIR)/LomasModules/%.cpp.o: LomasModules/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(LOMAS_CUSTOM),$(call custom_module_names,$(m),Lomas)) \ + -DpluginInstance=pluginInstance__Lomas + $(BUILD_DIR)/LyraeModules/%.cpp.o: LyraeModules/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index bfe8608..9d4180e 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -383,6 +383,10 @@ extern Model* modelDriftgen; // LittleUtils #include "LittleUtils/src/plugin.hpp" +// LomasModules +#include "LomasModules/src/plugin.hpp" +#undef DR_WAV_IMPLEMENTATION + // LyraeModules /* NOTE too much noise in original include, do this a different way // #include "LyraeModules/src/plugin.hpp" @@ -515,6 +519,7 @@ extern Plugin* pluginInstance__ImpromptuModular; Plugin* pluginInstance__JW; Plugin* pluginInstance__LifeFormModular; Plugin* pluginInstance__LittleUtils; +Plugin* pluginInstance__Lomas; Plugin* pluginInstance__Lyrae; extern Plugin* pluginInstance__MindMeld; Plugin* pluginInstance__Mog; @@ -1573,6 +1578,19 @@ static void initStatic__LittleUtils() } } +static void initStatic__Lomas() +{ + Plugin* const p = new Plugin; + pluginInstance__Lomas = p; + + const StaticPluginLoader spl(p, "LomasModules"); + if (spl.ok()) + { + p->addModel(modelAdvancedSampler); + p->addModel(modelGateSequencer); + } +} + static void initStatic__Lyrae() { Plugin* const p = new Plugin; @@ -1857,6 +1875,7 @@ void initStaticPlugins() initStatic__JW(); initStatic__LifeFormModular(); initStatic__LittleUtils(); + initStatic__Lomas(); initStatic__Lyrae(); initStatic__MindMeld(); initStatic__Mog(); diff --git a/plugins/res/LomasModules b/plugins/res/LomasModules new file mode 120000 index 0000000..cb3ba4a --- /dev/null +++ b/plugins/res/LomasModules @@ -0,0 +1 @@ +../LomasModules/res \ No newline at end of file