From c405c333b12ae346e8dfe1876942fb191570dadb Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Mon, 18 Oct 2021 16:17:31 +0100
Subject: [PATCH] Add JW-Modules

Signed-off-by: falkTX <falktx@falktx.com>
---
 .gitmodules         |  3 +++
 plugins/JW-Modules  |  1 +
 plugins/Makefile    | 18 ++++++++++++++++++
 plugins/plugins.cpp | 45 +++++++++++++++++++++++++++++++++++++++++++++
 plugins/todo.txt    | 10 +++++++---
 5 files changed, 74 insertions(+), 3 deletions(-)
 create mode 160000 plugins/JW-Modules

diff --git a/.gitmodules b/.gitmodules
index 6901c83..43d7afa 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -37,3 +37,6 @@
 [submodule "plugins/ESeries"]
 	path = plugins/ESeries
 	url = https://github.com/VCVRack/ESeries.git
+[submodule "plugins/JW-Modules"]
+	path = plugins/JW-Modules
+	url = https://github.com/jeremywen/JW-Modules.git
diff --git a/plugins/JW-Modules b/plugins/JW-Modules
new file mode 160000
index 0000000..6ce3b78
--- /dev/null
+++ b/plugins/JW-Modules
@@ -0,0 +1 @@
+Subproject commit 6ce3b78125ea65fb5cf15a1a33ba8f29a240439d
diff --git a/plugins/Makefile b/plugins/Makefile
index 6b11816..e8d1197 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -167,6 +167,19 @@ PLUGIN_FILES += $(filter-out Fundamental/src/plugin.cpp,$(wildcard Fundamental/s
 
 PLUGIN_FILES += $(filter-out GrandeModular/src/plugin.cpp,$(wildcard GrandeModular/src/*.cpp))
 
+# --------------------------------------------------------------
+# JW-Modules
+
+PLUGIN_FILES += $(filter-out JW-Modules/src/JWModules.cpp,$(wildcard JW-Modules/src/*.cpp))
+PLUGIN_FILES += $(wildcard JW-Modules/lib/oscpack/ip/*.cpp)
+PLUGIN_FILES += $(wildcard JW-Modules/lib/oscpack/osc/*.cpp)
+ifeq ($(WINDOWS),true)
+PLUGIN_FILES += $(wildcard JW-Modules/lib/oscpack/ip/win32/*.cpp)
+# LDFLAGS += -lws2_32 -lwinmm
+else
+PLUGIN_FILES += $(wildcard JW-Modules/lib/oscpack/ip/posix/*.cpp)
+endif
+
 # --------------------------------------------------------------
 # ValleyAudio (does not build against v2)
 
@@ -331,6 +344,11 @@ $(BUILD_DIR)/GrandeModular/%.cpp.o: GrandeModular/%.cpp
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -DpluginInstance=pluginInstance__GrandeModular -c -o $@
 
+$(BUILD_DIR)/JW-Modules/%.cpp.o: JW-Modules/%.cpp
+	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
+	@echo "Compiling $<"
+	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -DpluginInstance=pluginInstance__JW -IJW-Modules/src -IJW-Modules/lib/oscpack -c -o $@
+
 $(BUILD_DIR)/ValleyAudio/%.cpp.o: ValleyAudio/%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling $<"
diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp
index 3afe7b3..15c41db 100644
--- a/plugins/plugins.cpp
+++ b/plugins/plugins.cpp
@@ -165,6 +165,9 @@
 // GrandeModular
 #include "GrandeModular/src/plugin.hpp"
 
+// JW-Modules
+#include "JW-Modules/src/JWModules.hpp"
+
 // ValleyAudio
 /* does not build against v2
 #include "ValleyAudio/src/Valley.hpp"
@@ -182,6 +185,7 @@ Plugin* pluginInstance__Cardinal;
 Plugin* pluginInstance__ESeries;
 Plugin* pluginInstance__Fundamental;
 Plugin* pluginInstance__GrandeModular;
+Plugin* pluginInstance__JW;
 Plugin* pluginInstance__ValleyAudio;
 Plugin* pluginInstance__ZetaCarinaeModules;
 
@@ -678,6 +682,46 @@ static void initStatic__GrandeModular()
     }
 }
 
+static void initStatic__JW()
+{
+    Plugin* const p = new Plugin;
+    pluginInstance__JW = p;
+
+    const StaticPluginLoader spl(p, "JW-Modules");
+    if (spl.ok())
+    {
+        p->addModel(modelAdd5);
+        p->addModel(modelBouncyBalls);
+        p->addModel(modelCat);
+        p->addModel(modelTree);
+        p->addModel(modelFullScope);
+        p->addModel(modelGridSeq);
+        p->addModel(modelEightSeq);
+        p->addModel(modelDivSeq);
+        p->addModel(modelMinMax);
+        p->addModel(modelNoteSeq);
+        p->addModel(modelNoteSeqFu);
+        p->addModel(modelNoteSeq16);
+        p->addModel(modelTrigs);
+        p->addModel(modelOnePattern);
+        p->addModel(modelPatterns);
+        p->addModel(modelQuantizer);
+        p->addModel(modelSimpleClock);
+        p->addModel(modelStr1ker);
+        p->addModel(modelD1v1de);
+        p->addModel(modelPres1t);
+        p->addModel(modelThingThing);
+        p->addModel(modelWavHead);
+        p->addModel(modelXYPad);
+        p->addModel(modelBlankPanel1hp);
+        p->addModel(modelBlankPanelSmall);
+        p->addModel(modelBlankPanelMedium);
+        p->addModel(modelBlankPanelLarge);
+        p->addModel(modelCoolBreeze);
+        p->addModel(modelPete);
+    }
+}
+
 /* does not build against v2
 static void initStatic__ValleyAudio()
 {
@@ -730,6 +774,7 @@ void initStaticPlugins()
     initStatic__ESeries();
     initStatic__Fundamental();
     initStatic__GrandeModular();
+    initStatic__JW();
     /* does not build against v2
     initStatic__ValleyAudio();
     */
diff --git a/plugins/todo.txt b/plugins/todo.txt
index 24e559e..e06db5a 100644
--- a/plugins/todo.txt
+++ b/plugins/todo.txt
@@ -1,10 +1,15 @@
 List of plugins still to add, sorted by popularity
 
+- Working but limited: (v2 related limitations)
+Befaco
+
+- Have definitions in place but cannot build against v2
+Valley
+
+- TODO
 Grayscale                 74754.0
-JW-Modules                65172.0
 AS                        64626.0
 ImpromptuModular          62537.0
-Valley                    62078.0
 VultModulesFree           61804.0
 AmalgamatedHarmonics      59071.0
 NYSTHI                    58494.0
@@ -16,7 +21,6 @@ ArableInstruments         48756.0
 squinkylabs-plug1         48682.0
 SonusModular              45245.0
 LindenbergResearch        43959.0
-
 Geodesics                 42761.0
 mscHack                   42316.0
 BaconMusic                42095.0