Add AS modules

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

.gitmodules

@@ -43,3 +43,6 @@
 [submodule "plugins/rackwindows"]
 	path = plugins/rackwindows
 	url = https://github.com/n0jo/rackwindows.git
+[submodule "plugins/AS"]
+	path = plugins/AS
+	url = https://github.com/AScustomWorks/AS.git

plugins/AS

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

plugins/Makefile

@@ -23,6 +23,15 @@ PLUGIN_FILES  = plugins.cpp
 
 PLUGIN_FILES += $(wildcard AnimatedCircuits/src/Folding/*.cpp)
 
+# --------------------------------------------------------------
+# AS
+
+PLUGIN_FILES += $(filter-out AS/src/AS.cpp,$(wildcard AS/src/*.cpp))
+PLUGIN_FILES += AS/freeverb/revmodel.cpp
+
+# modules which are present in other plugins
+AS_CUSTOM = ADSR VCA revmodel
+
 # --------------------------------------------------------------
 # AudibleInstruments
 
@@ -283,7 +292,7 @@ clean:
 # Build commands
 
 # function for custom module names macro
-custom_module_names = -Dmodel${1}=model${2}${1} -D${1}Widget=${2}${1}Widget
+custom_module_names = -D${1}=${2}${1} -Dmodel${1}=model${2}${1} -D${1}Widget=${2}${1}Widget
 
 $(TARGET): $(PLUGIN_OBJS)
 	@echo "Creating $@"
@@ -310,6 +319,11 @@ $(BUILD_DIR)/AnimatedCircuits/%.cpp.o: AnimatedCircuits/%.cpp
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -DpluginInstance=pluginInstance__AnimatedCircuits -c -o $@
 
+$(BUILD_DIR)/AS/%.cpp.o: AS/%.cpp
+	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
+	@echo "Compiling $<"
+	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -DpluginInstance=pluginInstance__AS $(foreach m,$(AS_CUSTOM),$(call custom_module_names,$(m),AS)) -c -o $@
+
 $(BUILD_DIR)/AudibleInstruments/%.cc.o: AudibleInstruments/%.cc
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling $<"

plugins/plugins.cpp

@@ -22,6 +22,13 @@
 // AnimatedCircuits
 #include "AnimatedCircuits/src/plugin.hpp"
 
+// AS
+#define modelADSR modelASADSR
+#define modelVCA modelASVCA
+#include "AS/src/AS.hpp"
+#undef modelADSR
+#undef modelVCA
+
 // AudibleInstruments
 #include "AudibleInstruments/src/plugin.hpp"
 
@@ -189,6 +196,7 @@ void saveHighQualityAsDefault(bool) {}
 #include "ZetaCarinaeModules/src/plugin.hpp"
 
 Plugin* pluginInstance__AnimatedCircuits;
+Plugin* pluginInstance__AS;
 Plugin* pluginInstance__AudibleInstruments;
 Plugin* pluginInstance__Befaco;
 Plugin* pluginInstance__Bidoo;
@@ -337,6 +345,72 @@ static void initStatic__AnimatedCircuits()
     }
 }
 
+static void initStatic__AS()
+{
+    Plugin* const p = new Plugin;
+    pluginInstance__AS = p;
+
+    const StaticPluginLoader spl(p, "AS");
+    if (spl.ok())
+    {
+#define modelADSR modelASADSR
+#define modelVCA modelASVCA
+        //OSCILLATORS
+        p->addModel(modelSineOsc);
+        p->addModel(modelSawOsc);
+
+        //TOOLS
+        p->addModel(modelADSR);
+        p->addModel(modelVCA);
+        p->addModel(modelQuadVCA);
+        p->addModel(modelTriLFO);
+        p->addModel(modelAtNuVrTr);
+        p->addModel(modelBPMClock);
+        p->addModel(modelSEQ16);
+        p->addModel(modelMixer2ch);
+        p->addModel(modelMixer4ch);
+        p->addModel(modelMixer8ch);
+        p->addModel(modelMonoVUmeter);
+        p->addModel(modelStereoVUmeter);
+        p->addModel(modelMultiple2_5);
+        p->addModel(modelMerge2_5);
+        p->addModel(modelSteps);
+        p->addModel(modelLaunchGate);
+        p->addModel(modelKillGate);
+        p->addModel(modelFlow);
+        p->addModel(modelSignalDelay);
+        p->addModel(modelTriggersMKI);
+        p->addModel(modelTriggersMKII);
+        p->addModel(modelTriggersMKIII);
+        p->addModel(modelBPMCalc);
+        p->addModel(modelBPMCalc2);
+        p->addModel(modelCv2T);
+        p->addModel(modelZeroCV2T);
+        p->addModel(modelReScale);
+
+        //EFFECTS
+        p->addModel(modelDelayPlusFx);
+        p->addModel(modelDelayPlusStereoFx);
+        p->addModel(modelPhaserFx);
+        p->addModel(modelReverbFx);
+        p->addModel(modelReverbStereoFx);
+        p->addModel(modelSuperDriveFx);
+        p->addModel(modelSuperDriveStereoFx);
+        p->addModel(modelTremoloFx);
+        p->addModel(modelTremoloStereoFx);
+        p->addModel(modelWaveShaper);
+        p->addModel(modelWaveShaperStereo);
+
+        //BLANK PANELS
+        p->addModel(modelBlankPanel4);
+        p->addModel(modelBlankPanel6);
+        p->addModel(modelBlankPanel8);
+        p->addModel(modelBlankPanelSpecial);
+#undef modelADSR
+#undef modelVCA
+    }
+}
+
 static void initStatic__AudibleInstruments()
 {
     Plugin* const p = new Plugin;
@@ -813,6 +887,7 @@ void initStaticPlugins()
 {
     initStatic__Core();
     initStatic__AnimatedCircuits();
+    initStatic__AS();
     initStatic__AudibleInstruments();
     initStatic__Befaco();
     initStatic__Bidoo();

plugins/todo.txt

@@ -10,9 +10,6 @@ Valley
 
 Grayscale                 74754.0 (not opensource?)
 
-AS                        64626.0
-https://github.com/AScustomWorks/AS
-
 ImpromptuModular          62537.0
 https://github.com/MarcBoule/ImpromptuModular