1
Fork 0

adding kocmoc (#176)

This commit is contained in:
dreamer 2022-02-25 18:22:11 +01:00 committed by GitHub
parent 7aedbcda62
commit f462ed8380
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 52 additions and 0 deletions

3
.gitmodules vendored
View File

@ -163,3 +163,6 @@
[submodule "plugins/LilacLoop"]
path = plugins/LilacLoop
url = https://github.com/grough/lilac-loop-vcv.git
[submodule "plugins/kocmoc"]
path = plugins/kocmoc
url = https://github.com/janne808/kocmoc-rack-modules.git

View File

@ -130,6 +130,7 @@ At the moment the following 3rd-party modules are provided:
- ihtsyn
- Impromptu
- JW-Modules
- kocmoc
- LifeFormModular
- Lilac Loop
- Little Utils

View File

@ -41,6 +41,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule
| ihtsyn | GPL-3.0-or-later | |
| Impromptu | GPL-3.0-or-later | |
| JW-Modules | BSD-3-Clause | |
| kocmoc | GPL-3.0-or-later | |
| LifeFormModular | MIT | |
| Lilac Loop | GPL-3.0-or-later | |
| Little Utils | EUPL-1.2 | |
@ -133,6 +134,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 |
| 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 |
| LittleUtils/* | EUPL-1.2 | Same license as source code |

View File

@ -569,6 +569,11 @@ endif
# modules/types which are present in other plugins
JW_CUSTOM = PlayHead Quantizer
# --------------------------------------------------------------
# kocmoc
PLUGIN_FILES += $(wildcard kocmoc/src/*.cpp)
# --------------------------------------------------------------
# LifeFormModular
@ -1415,6 +1420,13 @@ $(BUILD_DIR)/JW-Modules/%.cpp.o: JW-Modules/%.cpp
-Wno-unused-but-set-variable \
-Wno-unused-result
$(BUILD_DIR)/kocmoc/%.cpp.o: kocmoc/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
$(foreach m,$(KOCMOC_CUSTOM),$(call custom_module_names,$(m),kocmoc)) \
-DpluginInstance=pluginInstance__kocmoc
$(BUILD_DIR)/LifeFormModular/%.cpp.o: LifeFormModular/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"

1
plugins/kocmoc Submodule

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

View File

@ -410,6 +410,9 @@ extern Model* modelBlankPanel;
#include "JW-Modules/src/JWModules.hpp"
#undef modelQuantizer
// kocmoc
#include "kocmoc/src/plugin.hpp"
// LifeFormModular
/* NOTE too much noise in original include, do this a different way
// #include "LifeFormModular/src/plugin.hpp"
@ -659,6 +662,7 @@ Plugin* pluginInstance__HetrickCV;
extern Plugin* pluginInstance__ImpromptuModular;
Plugin* pluginInstance__ihtsyn;
Plugin* pluginInstance__JW;
Plugin* pluginInstance__kocmoc;
Plugin* pluginInstance__LifeFormModular;
Plugin* pluginInstance__LilacLoop;
Plugin* pluginInstance__LittleUtils;
@ -1770,6 +1774,25 @@ static void initStatic__JW()
}
}
static void initStatic__kocmoc()
{
Plugin* const p = new Plugin;
pluginInstance__kocmoc= p;
const StaticPluginLoader spl(p, "kocmoc");
if (spl.ok())
{
p->addModel(modelSVF_1);
p->addModel(modelTRG);
p->addModel(modelLADR);
p->addModel(modelOP);
p->addModel(modelPHASR);
p->addModel(modelMUL);
p->addModel(modelSKF);
p->addModel(modelDDLY);
}
}
static void initStatic__LifeFormModular()
{
Plugin* const p = new Plugin;
@ -2278,6 +2301,7 @@ void initStaticPlugins()
initStatic__ImpromptuModular();
initStatic__ihtsyn();
initStatic__JW();
initStatic__kocmoc();
initStatic__LifeFormModular();
initStatic__LilacLoop();
initStatic__LittleUtils();

View File

@ -243,6 +243,15 @@ static const struct {
{ "/LittleUtils/res/PulseGenerator.svg", {}, -1 },
{ "/LittleUtils/res/TeleportIn.svg", {}, -1 },
{ "/LittleUtils/res/TeleportOut.svg", {}, -1 },
// GPL-3.0-or-later
{ "/kocmoc/res/DDLY.svg", {}, -1 },
{ "/kocmoc/res/LADR.svg", {}, -1 },
{ "/kocmoc/res/MUL.svg", {}, -1 },
{ "/kocmoc/res/OP.svg", {}, -1 },
{ "/kocmoc/res/PHASR.svg", {}, -1 },
{ "/kocmoc/res/SKF.svg", {}, -1 },
{ "/kocmoc/res/SVF.svg", {}, -1 },
{ "/kocmoc/res/TRG.svg", {}, -1 },
};
static inline bool invertPaint(NSVGpaint& paint, const char* const svgFileToInvert = nullptr)