Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Sculpt-O-Sound Vocode-O-Matic module #505

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 5 additions & 0 deletions docs/LICENSES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 | |
Expand Down Expand Up @@ -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 |
Expand Down
14 changes: 14 additions & 0 deletions plugins/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 $<"
Expand Down
1 change: 1 addition & 0 deletions plugins/Sculpt-O-Sound
Submodule Sculpt-O-Sound added at ab493b
20 changes: 20 additions & 0 deletions plugins/plugins.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -3114,6 +3133,7 @@ void initStaticPlugins()
initStatic__RebelTech();
initStatic__repelzen();
initStatic__Sapphire();
initStatic__Sculpt_O_Sound();
initStatic__sonusmodular();
initStatic__stocaudio();
initStatic__stoermelder_p1();
Expand Down