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

initial work for PdArray (#658)

Browse source 
* initial work for PdArray

* custom name for TextBox

* use DRWAV as custom for PdArray

* invert PdArray panels

* some more symbol fixes?

* Cleanup

Signed-off-by: falkTX <falktx@falktx.com>

* Fix typo

Signed-off-by: falkTX <falktx@falktx.com>

* Fix uninitialized values

Signed-off-by: falkTX <falktx@falktx.com>

---------

Signed-off-by: falkTX <falktx@falktx.com>
Co-authored-by: falkTX <falktx@falktx.com>
This commit is contained in:
dreamer 2024-05-04 02:29:43 +02:00 • committed by GitHub
parent 8777f99e90
commit 646f01d114
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 62 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
plugins/Makefile
View file

@ -971,6 +971,14 @@ PLUGIN_FILES += $(filter-out PathSet/src/plugin.cpp,$(wildcard PathSet/src/*.cpp
# modules/types which are present in other plugins
PATHSET_CUSTOM = PitchShifter
# --------------------------------------------------------------
# PdArray
PLUGIN_FILES += $(filter-out PdArray/src/plugin.cpp,$(wildcard PdArray/src/*.cpp))
# modules/types which are present in other plugins
PDARRAY_CUSTOM = $(DRWAV) CustomTrimpot MsDisplayWidget TextBox
# --------------------------------------------------------------
# PinkTrombone
@ -1445,11 +1453,11 @@ RESOURCE_FILES += MindMeldModular/res/ShapeMaster/MindMeldShapes
RESOURCE_FILES += Mog/res
RESOURCE_FILES += nonlinearcircuits/res
RESOURCE_FILES += ParableInstruments/res/Neil.png
RESOURCE_FILES += $(wildcard StarlingVia/res/original.*)
RESOURCE_FILES += surgext/build/surge-data/configuration.xml
RESOURCE_FILES += surgext/build/surge-data/fx_presets
RESOURCE_FILES += surgext/build/surge-data/wavetables
RESOURCE_FILES += surgext/build/surge-data/windows.wt
RESOURCE_FILES += $(wildcard StarlingVia/res/original.*)
RESOURCE_FILES += $(wildcard surgext/res/xt/fonts/quicksand/*.ttf)
RESOURCE_FILES += $(wildcard unless_modules/art/*.art)
RESOURCE_FILES += $(wildcard unless_modules/art/svg/*/*.svg)
@ -2628,6 +2636,13 @@ $(BUILD_DIR)/PathSet/%.cpp.o: PathSet/%.cpp
$(foreach m,$(PATHSET_CUSTOM),$(call custom_module_names,$(m),PathSet)) \
-DpluginInstance=pluginInstance__PathSet
$(BUILD_DIR)/PdArray/%.cpp.o: PdArray/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
$(foreach m,$(PDARRAY_CUSTOM),$(call custom_module_names,$(m),PdArray)) \
-DpluginInstance=pluginInstance__PdArray
$(BUILD_DIR)/PinkTrombone/%.cpp.o: PinkTrombone/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"

1
plugins/PdArray Submodule

@ -0,0 +1 @@
Subproject commit 8e8e65490bf9d1708e586b1d759849bf2d76a4f0

37
plugins/plugins.cpp
View file

@ -776,6 +776,17 @@ extern Model* modelBlankPanel;
// Path Set
#include "PathSet/src/plugin.hpp"
// PdArray
#define TextBox PdArrayTextBox
#define CustomTrimpot PdArrayCustomTrimpot
#define MsDisplayWidget PdArrayMsDisplayWidget
#define MAX_POLY_CHANNELS PDARRAY_MAX_POLY_CHANNELS
#include "PdArray/src/plugin.hpp"
#undef Textbox
#undef CustomTrimpot
#undef MsDisplayWidget
#undef MAX_POLY_CHANNELS
// PinkTrombone
#include "PinkTrombone/src/plugin.hpp"
@ -946,6 +957,7 @@ Plugin* pluginInstance__nonlinearcircuits;
Plugin* pluginInstance__Orbits;
Plugin* pluginInstance__ParableInstruments;
Plugin* pluginInstance__PathSet;
Plugin* pluginInstance__PdArray;
Plugin* pluginInstance__PinkTrombone;
Plugin* pluginInstance__Prism;
Plugin* pluginInstance__rackwindows;
@ -1961,11 +1973,11 @@ static void initStatic__CVfunk()
p->addModel(modelSignals);
p->addModel(modelRanges);
p->addModel(modelHexMod);
p->addModel(modelCollatz);
p->addModel(modelStrings);
p->addModel(modelMagnets);
p->addModel(modelOuros);
p->addModel(modelPressedDuck);
p->addModel(modelCollatz);
p->addModel(modelStrings);
p->addModel(modelMagnets);
p->addModel(modelOuros);
p->addModel(modelPressedDuck);
#undef modelSteps
}
}
@ -2913,6 +2925,20 @@ static void initStatic__PathSet()
}
}
static void initStatic__PdArray()
{
Plugin* const p = new Plugin;
pluginInstance__PdArray = p;
const StaticPluginLoader spl(p, "PdArray");
if (spl.ok())
{
p->addModel(modelArray);
p->addModel(modelMiniramp);
p->addModel(modelMinistep);
}
}
static void initStatic__PinkTrombone()
{
Plugin* const p = new Plugin;
@ -3427,6 +3453,7 @@ void initStaticPlugins()
initStatic__Orbits();
initStatic__ParableInstruments();
initStatic__PathSet();
initStatic__PdArray();
initStatic__PinkTrombone();
initStatic__Prism();
initStatic__rackwindows();