From cdab26ef0c7190fc3d9eed34a6c73f00cf6b5658 Mon Sep 17 00:00:00 2001 From: dreamer Date: Fri, 29 Apr 2022 04:22:46 +0200 Subject: [PATCH] [WIP] add WhatTheRack --- .gitmodules | 3 +++ README.md | 1 + docs/LICENSES.md | 4 ++++ plugins/Makefile | 16 +++++++++++++++- plugins/WhatTheRack | 1 + plugins/plugins.cpp | 19 +++++++++++++++++++ 6 files changed, 43 insertions(+), 1 deletion(-) create mode 160000 plugins/WhatTheRack diff --git a/.gitmodules b/.gitmodules index 6ecf1ba..05b3b8d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -190,3 +190,6 @@ [submodule "plugins/unless_modules"] path = plugins/unless_modules url = https://gitlab.com/unlessgames/unless_modules.git +[submodule "plugins/WhatTheRack"] + path = plugins/WhatTheRack + url = https://github.com/korfuri/WhatTheRack.git diff --git a/README.md b/README.md index dcee0fb..7ec6042 100644 --- a/README.md +++ b/README.md @@ -163,6 +163,7 @@ At the moment the following 3rd-party modules are provided: - unless_modules - Valley - Voxglitch +- WhatTheRack - ZetaCarinae - ZZC diff --git a/docs/LICENSES.md b/docs/LICENSES.md index c8ccce1..d842fd4 100644 --- a/docs/LICENSES.md +++ b/docs/LICENSES.md @@ -69,6 +69,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule | unless_modules | GPL-3.0-or-later | | | Valley | GPL-3.0-or-later | | | Voxglitch | GPL-3.0-or-later | | +| WhatTheRack | WTFPL | | | ZetaCarinae | GPL-3.0-or-later | | | ZZC | GPL-3.0-or-later | | @@ -195,6 +196,9 @@ Below is a list of artwork licenses from plugins | ValleyAudio/ShareTechMono-*.ttf | OFL-1.1-RFN | | | voxglitch/* | GPL-3.0-or-later | No artwork specific license provided | | voxglitch/ShareTechMono-Regular.ttf | OFL-1.1-RFN | | +| WhatTheRack/* | WTFPL | | +| WhatTheRack/BoomButton/* | CC-BY-3.0 | | +| WhatTheRack/fonts/* | | Needs clarification/modification! | | ZetaCarinaeModules/* | GPL-3.0-or-later | [Same license as source code](https://github.com/mhampton/ZetaCarinaeModules/issues/8) | | ZZC/* | CC-BY-NC-SA-4.0 | | | ZZC/panels/* | CC-BY-NC-SA-4.0 | NOTE: The ZZC Logo is Copyright (c) 2019 Sergey Ukolov and cannot be used in derivative works; Cardinal's use does not officially constitute derivative work. | diff --git a/plugins/Makefile b/plugins/Makefile index f398e45..1b936f8 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -850,7 +850,13 @@ VALLEYAUDIO_CUSTOM_PER_FILE = TempoKnob # -------------------------------------------------------------- # Voxglitch -PLUGIN_FILES += $(filter-out voxglitch/src/plugin.cpp,$(wildcard voxglitch/src/*.cpp)) +PLUGIN_FILES += $(filter-out voxglitch/src/WhatTheRack.cpp,$(wildcard voxglitch/src/*.cpp)) + +# -------------------------------------------------------------- +# WhatTheRack + +PLUGIN_FILES += $(filter-out WhatTheRack/src/plugin.cpp,$(wildcard WhatTheRack/src/*.cpp)) + # modules/types which are present in other plugins VOXGLITCH_CUSTOM = $(DRWAV) AudioFile Looper Readout @@ -1729,6 +1735,14 @@ $(BUILD_DIR)/voxglitch/%.cpp.o: voxglitch/%.cpp -DpluginInstance=pluginInstance__Voxglitch \ -DSKIP_MINGW_FORMAT +$(BUILD_DIR)/WhatTheRack/%.cpp.o: WhatTheRack/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(WHATTHERACK_CUSTOM),$(call custom_module_names,$(m),WhatTheRack)) \ + -DpluginInstance=pluginInstance__WhatTheRack \ + -UBUILDING_PLUGIN_MODULES + $(BUILD_DIR)/ZetaCarinaeModules/%.cpp.o: ZetaCarinaeModules/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/WhatTheRack b/plugins/WhatTheRack new file mode 160000 index 0000000..7e17e5a --- /dev/null +++ b/plugins/WhatTheRack @@ -0,0 +1 @@ +Subproject commit 7e17e5a8e5c69b36e4255f2f1e5e7403bf06a756 diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index df7bafc..5b9e46c 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -658,6 +658,9 @@ extern Model* modelBlankPanel; #include "voxglitch/src/plugin.hpp" #undef modelLooper +// WhatTheRack +#include "WhatTheRack/src/WhatTheRack.hpp" + // ZetaCarinaeModules #include "ZetaCarinaeModules/src/plugin.hpp" @@ -741,6 +744,7 @@ Plugin* pluginInstance__stocaudio; Plugin* pluginInstance__unless_modules; Plugin* pluginInstance__ValleyAudio; Plugin* pluginInstance__Voxglitch; +Plugin* pluginInstance__WhatTheRack; Plugin* pluginInstance__ZetaCarinaeModules; Plugin* pluginInstance__ZZC; #endif // NOPLUGINS @@ -2451,6 +2455,20 @@ static void initStatic__Voxglitch() } } +static void initStatic__WhatTheRack() +{ + Plugin* p = new Plugin; + pluginInstance__WhatTheRack = p; + + const StaticPluginLoader spl(p, "WhatTheRack"); + if (spl.ok()) + { + p->addModel(modelWhatTheRack); + p->addModel(modelWhatTheMod); + p->addModel(modelWhatTheJack); + } +} + static void initStatic__ZetaCarinaeModules() { Plugin* p = new Plugin; @@ -2553,6 +2571,7 @@ void initStaticPlugins() initStatic__unless_modules(); initStatic__ValleyAudio(); initStatic__Voxglitch(); + initStatic__WhatTheRack(); initStatic__ZetaCarinaeModules(); initStatic__ZZC(); #endif // NOPLUGINS