brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixup substation

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-02-22 20:46:34 +00:00
parent dd661db6b8
commit 86c5d6ed7a
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
4 changed files with 20 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -132,4 +132,4 @@
url = https://github.com/NikolaiVChr/Autinn.git url = https://github.com/NikolaiVChr/Autinn.git
[submodule "plugins/substation-opensource"] [submodule "plugins/substation-opensource"]
path = plugins/substation-opensource path = plugins/substation-opensource
url = https://gitlab.com/slimechild/substation-opensource.git url = https://gitlab.com/falktx/substation-opensource.git

9
plugins/Makefile
View file

@ -627,10 +627,8 @@ PLUGIN_FILES += $(filter-out sonusmodular/src/sonusmodular,$(wildcard sonusmodul
PLUGIN_FILES += $(wildcard substation-opensource/dep/slime4rack/src/slime/*.cpp) PLUGIN_FILES += $(wildcard substation-opensource/dep/slime4rack/src/slime/*.cpp)
PLUGIN_FILES += $(wildcard substation-opensource/dep/slime4rack/src/slime/**/*.cpp) PLUGIN_FILES += $(wildcard substation-opensource/dep/slime4rack/src/slime/**/*.cpp)
PLUGIN_FILES += $(filter-out substation-opensource/src/_plugin.cpp,$(wildcard substation-opensource/src/*.cpp)) PLUGIN_FILES += $(filter-out substation-opensource/src/_plugin.cpp substation-opensource/src/Settings.cpp,$(wildcard substation-opensource/src/*.cpp))
PLUGIN_FILES += substation-settings/Settings.cpp
# modules/types which are present in other plugins
SUBSTATION_CUSTOM = Clock Mixer Quantizer VCA init
# -------------------------------------------------------------- # --------------------------------------------------------------
# ValleyAudio # ValleyAudio
@ -1410,14 +1408,13 @@ $(BUILD_DIR)/sonusmodular/%.cpp.o: sonusmodular/%.cpp
$(foreach m,$(SONUSMODULAR_CUSTOM),$(call custom_module_names,$(m),sonusmodular)) \ $(foreach m,$(SONUSMODULAR_CUSTOM),$(call custom_module_names,$(m),sonusmodular)) \
-DpluginInstance=pluginInstance__sonusmodular -DpluginInstance=pluginInstance__sonusmodular
$(BUILD_DIR)/substation-opensource/%.cpp.o: substation-opensource/%.cpp $(BUILD_DIR)/substation-%.cpp.o: substation-%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<" @echo "Compiling $<"
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
$(foreach m,$(SUBSTATION_CUSTOM),$(call custom_module_names,$(m),substation)) \ $(foreach m,$(SUBSTATION_CUSTOM),$(call custom_module_names,$(m),substation)) \
-DpluginInstance=pluginInstance__substation \ -DpluginInstance=pluginInstance__substation \
-D'PRIVATE=__attribute__((error("Using internal Rack function or symbol")))' \ -D'PRIVATE=__attribute__((error("Using internal Rack function or symbol")))' \
-Werror \
-Isubstation-opensource/dep/slime4rack/include -Isubstation-opensource/dep/slime4rack/include
$(BUILD_DIR)/ValleyAudio/%.cpp.o: ValleyAudio/%.cpp $(BUILD_DIR)/ValleyAudio/%.cpp.o: ValleyAudio/%.cpp

42
plugins/plugins.cpp
View file

@ -500,10 +500,9 @@ extern Model* modelMaude_221;
//substation //substation
// NOTE too much noise in original include, do this a different way // NOTE too much noise in original include, do this a different way
// "substation-opensource/src/_plugin.hpp" // "substation-opensource/src/_plugin.hpp"
#define modelClock modelsubstationClock namespace slime {
#define modelMixer modelsubstationMixer namespace plugin {
#define modelQuantizer modelsubstationQuantizer namespace substation {
#define modelVCA modelsubstationVCA
extern Model* modelClock; extern Model* modelClock;
extern Model* modelPolySequencer; extern Model* modelPolySequencer;
extern Model* modelSubOscillator; extern Model* modelSubOscillator;
@ -515,10 +514,7 @@ extern Model* modelVCA;
extern Model* modelBlank4; extern Model* modelBlank4;
extern Model* modelBlank7; extern Model* modelBlank7;
extern Model* modelFilterPlus; extern Model* modelFilterPlus;
#undef modelClock }}}
#undef modelMixer
#undef modelQuantizer
#undef modelVCA
// ValleyAudio // ValleyAudio
#include "ValleyAudio/src/Valley.hpp" #include "ValleyAudio/src/Valley.hpp"
@ -1854,25 +1850,17 @@ static void initStatic__substation()
const StaticPluginLoader spl(p, "substation-opensource"); const StaticPluginLoader spl(p, "substation-opensource");
if (spl.ok()) if (spl.ok())
{ {
#define modelClock modelsubstationClock p->addModel(slime::plugin::substation::modelClock);
#define modelMixer modelsubstationMixer p->addModel(slime::plugin::substation::modelEnvelopes);
#define modelQuantizer modelsubstationQuantizer p->addModel(slime::plugin::substation::modelFilter);
#define modelVCA modelsubstationVCA p->addModel(slime::plugin::substation::modelMixer);
p->addModel(modelClock); p->addModel(slime::plugin::substation::modelQuantizer);
p->addModel(modelEnvelopes); p->addModel(slime::plugin::substation::modelPolySequencer);
p->addModel(modelFilter); p->addModel(slime::plugin::substation::modelVCA);
p->addModel(modelMixer); p->addModel(slime::plugin::substation::modelSubOscillator);
p->addModel(modelQuantizer); p->addModel(slime::plugin::substation::modelBlank4);
p->addModel(modelPolySequencer); p->addModel(slime::plugin::substation::modelBlank7);
p->addModel(modelVCA); p->addModel(slime::plugin::substation::modelFilterPlus);
p->addModel(modelSubOscillator);
p->addModel(modelBlank4);
p->addModel(modelBlank7);
p->addModel(modelFilterPlus);
#undef modelClock
#undef modelMixer
#undef modelQuantizer
#undef modelVCA
} }
} }

2
plugins/substation-opensource

@ -1 +1 @@
Subproject commit f71030d598923be76a0d7f05af5be949500c17b5 Subproject commit 33a0e0cc1025aae66554238d3653aaf71d3e47a2