update JW-Modules (#828)

This commit is contained in:
dreamer 2025-05-14 07:05:37 +02:00 committed by GitHub
parent ed75b4989c
commit 7587c28d12
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 8 additions and 2 deletions

View file

@ -203,6 +203,7 @@ Below is a list of artwork licenses from plugins
| ImpromptuModular/res/comp/complib/* | CC-BY-NC-4.0 | | | ImpromptuModular/res/comp/complib/* | CC-BY-NC-4.0 | |
| JW-Modules/* | BSD-3-Clause | No artwork specific license provided | | JW-Modules/* | BSD-3-Clause | No artwork specific license provided |
| JW-Modules/DejaVuSansMono.ttf | Bitstream-Vera | Unused in Cardinal | | 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 | | kocmoc/* | GPL-3.0-or-later | No artwork specific license provided |
| LifeFormModular/* | MIT | No artwork specific license provided | | LifeFormModular/* | MIT | No artwork specific license provided |
| LilacLoop/* | GPL-3.0-or-later | No artwork specific license provided | | LilacLoop/* | GPL-3.0-or-later | No artwork specific license provided |

@ -1 +1 @@
Subproject commit d49cb1de630f278852d098dfbb09e3f4c9a8165e Subproject commit 72c8b569dd2cc12ce16abe2da582fc58e07c3d54

View file

@ -835,7 +835,7 @@ endif
endif endif
# modules/types which are present in other plugins # modules/types which are present in other plugins
JW_CUSTOM = PlayHead Quantizer JW_CUSTOM = PlayHead Quantizer Arrange
# -------------------------------------------------------------- # --------------------------------------------------------------
# kocmoc # kocmoc

View file

@ -574,8 +574,10 @@ extern Model* modelBlankPanel;
// JW-Modules // JW-Modules
#define modelQuantizer modelJWQuantizer #define modelQuantizer modelJWQuantizer
#define modelArrange modelJWArrange
#include "JW-Modules/src/JWModules.hpp" #include "JW-Modules/src/JWModules.hpp"
#undef modelQuantizer #undef modelQuantizer
#undef modelArrange
// kocmoc // kocmoc
#include "kocmoc/src/plugin.hpp" #include "kocmoc/src/plugin.hpp"
@ -2561,6 +2563,7 @@ static void initStatic__JW()
if (spl.ok()) if (spl.ok())
{ {
#define modelQuantizer modelJWQuantizer #define modelQuantizer modelJWQuantizer
#define modelArrange modelJWArrange
p->addModel(modelAdd5); p->addModel(modelAdd5);
p->addModel(modelAbcdSeq); p->addModel(modelAbcdSeq);
p->addModel(modelBouncyBalls); p->addModel(modelBouncyBalls);
@ -2596,7 +2599,9 @@ static void initStatic__JW()
#else #else
spl.removeModule("Str1ker"); spl.removeModule("Str1ker");
#endif #endif
p->addModel(modelArrange);
#undef modelQuantizer #undef modelQuantizer
#undef modelArrange
} }
} }