From 2074c8a3eb1b7e4aeb5fd4714e24144962146b2d Mon Sep 17 00:00:00 2001 From: dreamer Date: Tue, 13 May 2025 20:44:19 +0200 Subject: [PATCH] update JW-Modules --- docs/LICENSES.md | 1 + plugins/JW-Modules | 2 +- plugins/Makefile | 2 +- plugins/plugins.cpp | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/LICENSES.md b/docs/LICENSES.md index 7e17118..ac64140 100644 --- a/docs/LICENSES.md +++ b/docs/LICENSES.md @@ -201,6 +201,7 @@ Below is a list of artwork licenses from plugins | ImpromptuModular/res/comp/complib/* | CC-BY-NC-4.0 | | | JW-Modules/* | BSD-3-Clause | No artwork specific license provided | | JW-Modules/DejaVuSansMono.ttf | Bitstream-Vera | Unused in Cardinal | +| JW-Modules/res/fonts/ShareTechMono-Regular.ttf | OFL-1.1 | | | kocmoc/* | GPL-3.0-or-later | No artwork specific license provided | | LifeFormModular/* | MIT | No artwork specific license provided | | LilacLoop/* | GPL-3.0-or-later | No artwork specific license provided | diff --git a/plugins/JW-Modules b/plugins/JW-Modules index d49cb1d..72c8b56 160000 --- a/plugins/JW-Modules +++ b/plugins/JW-Modules @@ -1 +1 @@ -Subproject commit d49cb1de630f278852d098dfbb09e3f4c9a8165e +Subproject commit 72c8b569dd2cc12ce16abe2da582fc58e07c3d54 diff --git a/plugins/Makefile b/plugins/Makefile index ff10677..9060bea 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -824,7 +824,7 @@ endif endif # modules/types which are present in other plugins -JW_CUSTOM = PlayHead Quantizer +JW_CUSTOM = PlayHead Quantizer Arrange # -------------------------------------------------------------- # kocmoc diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 096d2d9..19a4279 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -570,8 +570,10 @@ extern Model* modelBlankPanel; // JW-Modules #define modelQuantizer modelJWQuantizer +#define modelArrange modelJWArrange #include "JW-Modules/src/JWModules.hpp" #undef modelQuantizer +#undef modelArrange // kocmoc #include "kocmoc/src/plugin.hpp" @@ -2539,6 +2541,7 @@ static void initStatic__JW() if (spl.ok()) { #define modelQuantizer modelJWQuantizer +#define modelArrange modelJWArrange p->addModel(modelAdd5); p->addModel(modelAbcdSeq); p->addModel(modelBouncyBalls); @@ -2574,7 +2577,9 @@ static void initStatic__JW() #else spl.removeModule("Str1ker"); #endif + p->addModel(modelArrange); #undef modelQuantizer +#undef modelArrange } }