From d06d68e9a59527f9a76ca1a0446563eb8b411a66 Mon Sep 17 00:00:00 2001 From: farlukar Date: Wed, 8 Mar 2023 21:27:31 +0100 Subject: [PATCH 1/6] Add Sculpt-O-Sound Vocode-O-Matic module --- .gitmodules | 3 +++ docs/LICENSES.md | 5 +++++ plugins/Makefile | 14 ++++++++++++++ plugins/plugins.cpp | 20 ++++++++++++++++++++ 4 files changed, 42 insertions(+) diff --git a/.gitmodules b/.gitmodules index 9c813376..26e4c44d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -230,3 +230,6 @@ [submodule "plugins/Sapphire"] path = plugins/Sapphire url = https://github.com/cosinekitty/sapphire.git +[submodule "plugins/Sculpt-O-Sound"] + path = plugins/Sculpt-O-Sound + url = https://github.com/josbouten/Sculpt-O-Sound.git diff --git a/docs/LICENSES.md b/docs/LICENSES.md index 971bf3ef..199ebfcf 100644 --- a/docs/LICENSES.md +++ b/docs/LICENSES.md @@ -74,6 +74,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule | repelzen | GPL-3.0-or-later | | | RebelTech | GPL-2.0-or-later | | | Sapphire | GPL-3.0-or-later | | +| Sculpt-O-Sound | GPL-3.0-or-later | | | Sonus Modular | GPL-3.0-or-later | | | stocaudio | GPL-3.0-or-later | | | Stoermelder Pack-One | GPL-3.0-or-later | | @@ -221,6 +222,10 @@ Below is a list of artwork licenses from plugins | repelzen/* | CC-BY-SA-4.0 | | | RebelTech/* | CC-BY-NC-4.0 | | | Sapphire/* | GPL-3.0-or-later | No artwork specific license provided | +| Sculpt-O-Sound/* | CC BY-NC-ND 4.0 | | +| Sculpt-O-Sound/Segment7Standard.ttf | OFL-1.1-RFN | | +| Sculpt-O-Sound/mschack/* | MIT | | +| Sculpt-O-Sound/tresamigos/* | MIT | | | sonusmodular/* | GPL-3.0-or-later | [Same license as source code](https://gitlab.com/sonusdept/sonusmodular/-/issues/14) | | stocaudio/* | GPL-3.0-or-later | No artwork specific license provided | | stoermelder-packone/* | GPL-3.0-or-later | No artwork specific license provided | diff --git a/plugins/Makefile b/plugins/Makefile index e8d52880..29856918 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -990,6 +990,13 @@ REPELZEN_CUSTOM = Blank Mixer Werner tanh_pade PLUGIN_FILES += $(filter-out Sapphire/src/plugin.cpp,$(wildcard Sapphire/src/*.cpp)) +# -------------------------------------------------------------- +# Sculpt-O-Sound + +PLUGIN_FILES += $(filter-out Sculpt-O-Sound/src/Sculpt-O-Sound.cpp,$(wildcard Sculpt-O-Sound/src/*.cpp)) + +SCULPT_O_SOUND_CUSTOM = LButton MySlider_01 Slider02_10x15 LedLight MsDisplayWidget + # -------------------------------------------------------------- # sonusmodular @@ -2665,6 +2672,13 @@ $(BUILD_DIR)/Sapphire/%.cpp.o: Sapphire/%.cpp $(foreach m,$(SAPPHIRE_CUSTOM),$(call custom_module_names,$(m),Sapphire)) \ -DpluginInstance=pluginInstance__sapphire +$(BUILD_DIR)/Sculpt-O-Sound/%.cpp.o: Sculpt-O-Sound/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(NOFINITE_FLAGS) -c -o $@ \ + $(foreach m,$(SCULPT_O_SOUND_CUSTOM),$(call custom_module_names,$(m),Sculpt_O_Sound)) \ + -DthePlugin=pluginInstance__Sculpt_O_Sound + $(BUILD_DIR)/sonusmodular/%.cpp.o: sonusmodular/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 429cbe37..31ef9cc3 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -719,6 +719,11 @@ void addThemeMenuItems(Menu*, ModuleTheme*) {} // Sapphire #include "Sapphire/src/plugin.hpp" +// Sculpt-O-Sound +#define LedLight Sculpt_O_SoundLedLight +#include "Sculpt-O-Sound/src/Sculpt-O-Sound.hpp" +#undef LedLight + // sonusmodular #include "sonusmodular/src/sonusmodular.hpp" @@ -854,6 +859,7 @@ Plugin* pluginInstance__rackwindows; Plugin* pluginInstance__RebelTech; Plugin* pluginInstance__repelzen; Plugin* pluginInstance__sapphire; +Plugin* pluginInstance__Sculpt_O_Sound; Plugin* pluginInstance__sonusmodular; Plugin* pluginInstance__stocaudio; extern Plugin* pluginInstance__stoermelder_p1; @@ -2743,6 +2749,19 @@ static void initStatic__Sapphire() } } +static void initStatic__Sculpt_O_Sound() +{ + Plugin* const p = new Plugin; + pluginInstance__Sculpt_O_Sound = p; + + const StaticPluginLoader spl(p, "Sculpt-O-Sound"); + if (spl.ok()) + { + p->addModel(modelVocode_O_Matic_XL); + p->addModel(modelVocode_O_Matic); + } +} + static void initStatic__sonusmodular() { Plugin* const p = new Plugin; @@ -3114,6 +3133,7 @@ void initStaticPlugins() initStatic__RebelTech(); initStatic__repelzen(); initStatic__Sapphire(); + initStatic__Sculpt_O_Sound(); initStatic__sonusmodular(); initStatic__stocaudio(); initStatic__stoermelder_p1(); From 23e5404bb46976ec418efd3cf1fc436c25d2f222 Mon Sep 17 00:00:00 2001 From: farlukar Date: Wed, 8 Mar 2023 22:43:48 +0100 Subject: [PATCH 2/6] add Sculpt-O-Sound repository --- plugins/Sculpt-O-Sound | 1 + 1 file changed, 1 insertion(+) create mode 160000 plugins/Sculpt-O-Sound diff --git a/plugins/Sculpt-O-Sound b/plugins/Sculpt-O-Sound new file mode 160000 index 00000000..ab493b88 --- /dev/null +++ b/plugins/Sculpt-O-Sound @@ -0,0 +1 @@ +Subproject commit ab493b8823b889f5e1998c1ccc07dcb5317557dd From 8aca525046ade07dfdc3388f8f5bbe512b7e9d38 Mon Sep 17 00:00:00 2001 From: farlukar Date: Sun, 19 Mar 2023 12:29:19 +0100 Subject: [PATCH 3/6] Update Sapphire --- plugins/Sapphire | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Sapphire b/plugins/Sapphire index 2d374e22..b30d2074 160000 --- a/plugins/Sapphire +++ b/plugins/Sapphire @@ -1 +1 @@ -Subproject commit 2d374e2222475aa4207aec8c541716ed467e2619 +Subproject commit b30d20745dd028961b0047b506d560ed48f2656c From b99341961bc95a7ea546a50e9585d7d926fad90e Mon Sep 17 00:00:00 2001 From: farlukar Date: Wed, 8 Mar 2023 21:27:31 +0100 Subject: [PATCH 4/6] Add Sculpt-O-Sound Vocode-O-Matic module --- plugins/plugins.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 31ef9cc3..cdd5ab3a 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -2762,6 +2762,19 @@ static void initStatic__Sculpt_O_Sound() } } +static void initStatic__Sculpt_O_Sound() +{ + Plugin* const p = new Plugin; + pluginInstance__Sculpt_O_Sound = p; + + const StaticPluginLoader spl(p, "Sculpt-O-Sound"); + if (spl.ok()) + { + p->addModel(modelVocode_O_Matic_XL); + p->addModel(modelVocode_O_Matic); + } +} + static void initStatic__sonusmodular() { Plugin* const p = new Plugin; From 76f5c822bce08847fde90f80732e387a3e5baeb8 Mon Sep 17 00:00:00 2001 From: farlukar Date: Sun, 19 Mar 2023 13:51:25 +0100 Subject: [PATCH 5/6] Revert "Merge branch 'Sculpt-O-Sound' of https://github.com/farlukar/Cardinal into Sculpt-O-Sound" This reverts commit 6cdbc1ad11ae30c6723567a3223c72eb2c5b807c, reversing changes made to c6664c82d310c9fac7cd567e6a583b248ce8e79f. --- plugins/plugins.cpp | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index cdd5ab3a..31ef9cc3 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -2762,19 +2762,6 @@ static void initStatic__Sculpt_O_Sound() } } -static void initStatic__Sculpt_O_Sound() -{ - Plugin* const p = new Plugin; - pluginInstance__Sculpt_O_Sound = p; - - const StaticPluginLoader spl(p, "Sculpt-O-Sound"); - if (spl.ok()) - { - p->addModel(modelVocode_O_Matic_XL); - p->addModel(modelVocode_O_Matic); - } -} - static void initStatic__sonusmodular() { Plugin* const p = new Plugin; From 901a21ea892356c9deaf75e6800f097fbeb66b8c Mon Sep 17 00:00:00 2001 From: farlukar Date: Sat, 8 Apr 2023 13:30:16 +0200 Subject: [PATCH 6/6] rebase, submodule update --- carla | 2 +- dpf | 2 +- plugins/Sapphire | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/carla b/carla index 56468b47..5d0d243b 160000 --- a/carla +++ b/carla @@ -1 +1 @@ -Subproject commit 56468b473205185bf120619c23b3d594513f4b7b +Subproject commit 5d0d243be13e2088e2c82d4d0bcc947edcd1b64d diff --git a/dpf b/dpf index 784309eb..90004b0d 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 784309eba858176d006182566bed4bc91eb7a069 +Subproject commit 90004b0d43875c3754142114112148b593615352 diff --git a/plugins/Sapphire b/plugins/Sapphire index b30d2074..163a8739 160000 --- a/plugins/Sapphire +++ b/plugins/Sapphire @@ -1 +1 @@ -Subproject commit b30d20745dd028961b0047b506d560ed48f2656c +Subproject commit 163a8739bd490e58e7e1d9d531b92876b821467f