Add LifeFormModular, fix a few name conflicts

Signed-off-by: falkTX <falktx@falktx.com>

.gitmodules

@@ -112,3 +112,6 @@
 [submodule "plugins/Extratone"]
 	path = plugins/Extratone
 	url = https://github.com/EaterOfSheep/Extratone.git
+[submodule "plugins/LifeFormModular"]
+	path = plugins/LifeFormModular
+	url = https://github.com/SteveRussell33/LifeFormModular.git

plugins/LifeFormModular

@@ -0,0 +1 @@
+Subproject commit c7b8d096f618c421d7d45784b894c0ac2f3395b0

plugins/Makefile

@@ -223,6 +223,7 @@ PLUGIN_FILES += AS/freeverb/revmodel.cpp
 
 # modules/types which are present in other plugins
 AS_CUSTOM = ADSR LabelDisplayWidget LowFrequencyOscillator VCA YellowRedLight allpass comb revmodel
+AS_CUSTOM_PER_FILE = NumberDisplayWidget
 
 # --------------------------------------------------------------
 # Atelier
@@ -478,6 +479,14 @@ endif
 # modules/types which are present in other plugins
 JW_CUSTOM = PlayHead Quantizer
 
+# --------------------------------------------------------------
+# LifeFormModular
+
+PLUGIN_FILES += $(filter-out LifeFormModular/src/plugin.cpp,$(wildcard LifeFormModular/src/*.cpp))
+
+# modules/types which are present in other plugins
+LIFEFORMMODULAR_CUSTOM = IO MS __ct_base __ct_comp
+
 # --------------------------------------------------------------
 # LittleUtils
 
@@ -529,8 +538,8 @@ PLUGIN_FILES += $(filter-out Prism/src/plugin.cpp, $(wildcard Prism/src/*.cpp))
 PLUGIN_FILES += $(wildcard Prism/src/scales/*.cpp)
 
 # modules/types which are present in other plugins
-PRISM_CUSTOM = bogaudio FilterSetting Scale
-PRISM_CUSTOM_PER_FILE = PrismFilterSetting
+PRISM_CUSTOM = bogaudio Filter FilterSetting Inputs Scale
+# PRISM_CUSTOM_PER_FILE = PrismFilterSetting
 
 # --------------------------------------------------------------
 # rackwindows
@@ -878,6 +887,7 @@ $(BUILD_DIR)/AS/%.cpp.o: AS/%.cpp
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
 		$(foreach m,$(AS_CUSTOM),$(call custom_module_names,$(m),AS)) \
+		$(foreach m,$(AS_CUSTOM_PER_FILE),$(call custom_per_file_names,$(m),AS_$(shell basename $*))) \
 		-DpluginInstance=pluginInstance__AS \
 		-Wno-unused-private-field
 
@@ -1097,6 +1107,13 @@ $(BUILD_DIR)/JW-Modules/%.cpp.o: JW-Modules/%.cpp
 		-Wno-unused-but-set-variable \
 		-Wno-unused-result
 
+$(BUILD_DIR)/LifeFormModular/%.cpp.o: LifeFormModular/%.cpp
+	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
+	@echo "Compiling $<"
+	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
+		$(foreach m,$(LIFEFORMMODULAR_CUSTOM),$(call custom_module_names,$(m),LifeFormModular)) \
+		-DpluginInstance=pluginInstance__LifeFormModular
+
 $(BUILD_DIR)/LittleUtils/%.cpp.o: LittleUtils/%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling $<"

plugins/plugins.cpp

@@ -359,6 +359,24 @@ extern Model *modelXYToPolar;
 #include "JW-Modules/src/JWModules.hpp"
 #undef modelQuantizer
 
+// LifeFormModular
+/* NOTE too much noise in original include, do this a different way
+// #include "LifeFormModular/src/plugin.hpp"
+*/
+extern Model* modelTimeDiktat;
+extern Model* modelSequenceModeler;
+extern Model* modelPitchDiktat;
+extern Model* modelPitchIntegrator;
+extern Model* modelBurstIntegrator;
+extern Model* modelQuadModulator;
+extern Model* modelImpulseControl;
+extern Model* modelQuadSteppedOffset;
+extern Model* modelPercussiveVibration;
+extern Model* modelQuadUtility;
+extern Model* modelAdditiveVibration;
+extern Model* modelComplexOsc;
+extern Model* modelDriftgen;
+
 // LittleUtils
 #include "LittleUtils/src/plugin.hpp"
 
@@ -491,6 +509,7 @@ Plugin* pluginInstance__GlueTheGiant;
 Plugin* pluginInstance__HetrickCV;
 extern Plugin* pluginInstance__ImpromptuModular;
 Plugin* pluginInstance__JW;
+Plugin* pluginInstance__LifeFormModular;
 Plugin* pluginInstance__LittleUtils;
 Plugin* pluginInstance__Lyrae;
 extern Plugin* pluginInstance__MindMeld;
@@ -1495,6 +1514,30 @@ static void initStatic__JW()
     }
 }
 
+static void initStatic__LifeFormModular()
+{
+    Plugin* const p = new Plugin;
+    pluginInstance__LifeFormModular= p;
+
+    const StaticPluginLoader spl(p, "LifeFormModular");
+    if (spl.ok())
+    {
+        p->addModel(modelTimeDiktat);
+        p->addModel(modelSequenceModeler);
+        p->addModel(modelPitchDiktat);
+        p->addModel(modelPitchIntegrator);
+        p->addModel(modelBurstIntegrator);
+        p->addModel(modelQuadModulator);
+        p->addModel(modelImpulseControl);
+        p->addModel(modelQuadSteppedOffset);
+        p->addModel(modelPercussiveVibration);
+        p->addModel(modelQuadUtility);
+        p->addModel(modelAdditiveVibration);
+        p->addModel(modelComplexOsc);
+        p->addModel(modelDriftgen);
+    }
+}
+
 static void initStatic__LittleUtils()
 {
     Plugin* const p = new Plugin;
@@ -1793,6 +1836,7 @@ void initStaticPlugins()
     initStatic__HetrickCV();
     initStatic__ImpromptuModular();
     initStatic__JW();
+    initStatic__LifeFormModular();
     initStatic__LittleUtils();
     initStatic__Lyrae();
     initStatic__MindMeld();

plugins/res/LifeFormModular

@@ -0,0 +1 @@
+../LifeFormModular/res