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

Slowly start introducing fundamental

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-03-24 22:43:00 +00:00
parent 849bacebfd
commit 9a792c72bf
4 changed files with 32 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -184,3 +184,6 @@
[submodule "plugins/ArableInstruments"] [submodule "plugins/ArableInstruments"]
path = plugins/ArableInstruments path = plugins/ArableInstruments
url = https://github.com/CardinalModules/ArableInstruments.git url = https://github.com/CardinalModules/ArableInstruments.git
[submodule "plugins/Fundamental"]
path = plugins/Fundamental
url = https://github.com/CardinalModules/Fundamental.git

1
plugins/Fundamental Submodule

@ -0,0 +1 @@
Subproject commit 9159cc3182ff3f4ec981fe574bd5dd1a9ea59490

4
plugins/Makefile
View file

@ -514,15 +514,11 @@ FEHLERFABRIK_CUSTOM = Operator Sequencer SlewLimiter
# -------------------------------------------------------------- # --------------------------------------------------------------
# Fundamental # Fundamental
ifeq ($(WITH_FUNDAMENTAL),true)
BASE_FLAGS += -DWITH_FUNDAMENTAL
PLUGIN_FILES += $(filter-out Fundamental/src/plugin.cpp,$(wildcard Fundamental/src/*.cpp)) PLUGIN_FILES += $(filter-out Fundamental/src/plugin.cpp,$(wildcard Fundamental/src/*.cpp))
PLUGIN_FILES += Fundamental/src/dr_wav.c PLUGIN_FILES += Fundamental/src/dr_wav.c
# modules/types which are present in other plugins # modules/types which are present in other plugins
FUNDAMENTAL_CUSTOM = $(DRWAV) FUNDAMENTAL_CUSTOM = $(DRWAV)
endif
# -------------------------------------------------------------- # --------------------------------------------------------------
# GlueTheGiant # GlueTheGiant

73
plugins/plugins.cpp
View file

@ -307,9 +307,7 @@ void setupSamples();
#include "FehlerFabrik/src/plugin.hpp" #include "FehlerFabrik/src/plugin.hpp"
// Fundamental // Fundamental
#ifdef WITH_FUNDAMENTAL
#include "Fundamental/src/plugin.hpp" #include "Fundamental/src/plugin.hpp"
#endif
// GlueTheGiant // GlueTheGiant
#include "GlueTheGiant/src/plugin.hpp" #include "GlueTheGiant/src/plugin.hpp"
@ -707,9 +705,7 @@ Plugin* pluginInstance__ESeries;
Plugin* pluginInstance__ExpertSleepersEncoders; Plugin* pluginInstance__ExpertSleepersEncoders;
Plugin* pluginInstance__Extratone; Plugin* pluginInstance__Extratone;
Plugin* pluginInstance__FehlerFabrik; Plugin* pluginInstance__FehlerFabrik;
#ifdef WITH_FUNDAMENTAL
Plugin* pluginInstance__Fundamental; Plugin* pluginInstance__Fundamental;
#endif
Plugin* pluginInstance__GlueTheGiant; Plugin* pluginInstance__GlueTheGiant;
Plugin* pluginInstance__GoodSheperd; Plugin* pluginInstance__GoodSheperd;
Plugin* pluginInstance__GrandeModular; Plugin* pluginInstance__GrandeModular;
@ -1589,7 +1585,6 @@ static void initStatic__FehlerFabrik()
} }
} }
#ifdef WITH_FUNDAMENTAL
static void initStatic__Fundamental() static void initStatic__Fundamental()
{ {
Plugin* const p = new Plugin; Plugin* const p = new Plugin;
@ -1598,48 +1593,38 @@ static void initStatic__Fundamental()
const StaticPluginLoader spl(p, "Fundamental"); const StaticPluginLoader spl(p, "Fundamental");
if (spl.ok()) if (spl.ok())
{ {
p->addModel(modelVCO);
p->addModel(modelVCO2);
p->addModel(modelVCF); p->addModel(modelVCF);
p->addModel(modelVCA_1);
p->addModel(modelVCA);
p->addModel(modelLFO);
p->addModel(modelLFO2);
p->addModel(modelDelay);
p->addModel(modelADSR);
p->addModel(modelMixer);
p->addModel(modelVCMixer);
p->addModel(model_8vert);
p->addModel(modelUnity);
p->addModel(modelMutes);
p->addModel(modelPulses);
p->addModel(modelScope);
p->addModel(modelSEQ3);
p->addModel(modelSequentialSwitch1);
p->addModel(modelSequentialSwitch2);
p->addModel(modelOctave);
p->addModel(modelQuantizer);
p->addModel(modelSplit);
p->addModel(modelMerge);
p->addModel(modelSum);
p->addModel(modelViz);
p->addModel(modelMidSide);
p->addModel(modelNoise);
p->addModel(modelRandom);
// show all plugins, helping those familiar with v1 Rack modules // TODO
if (json_t* const modules = json_object_get(spl.rootJ, "modules")) spl.removeModule("VCO");
{ spl.removeModule("VCO2");
size_t i; spl.removeModule("VCA");
json_t* v; spl.removeModule("VCA-1");
json_array_foreach(modules, i, v) spl.removeModule("LFO");
{ spl.removeModule("LFO2");
json_object_set(v, "hidden", json_false()); spl.removeModule("Delay");
} spl.removeModule("ADSR");
} spl.removeModule("Mixer");
spl.removeModule("VCMixer");
spl.removeModule("8vert");
spl.removeModule("Unity");
spl.removeModule("Mutes");
spl.removeModule("Pulses");
spl.removeModule("Scope");
spl.removeModule("SEQ3");
spl.removeModule("SequentialSwitch1");
spl.removeModule("SequentialSwitch2");
spl.removeModule("Octave");
spl.removeModule("Quantizer");
spl.removeModule("Split");
spl.removeModule("Merge");
spl.removeModule("Sum");
spl.removeModule("Viz");
spl.removeModule("MidSide");
spl.removeModule("Noise");
spl.removeModule("Random");
} }
} }
#endif
static void initStatic__GlueTheGiant() static void initStatic__GlueTheGiant()
{ {
@ -2515,9 +2500,7 @@ void initStaticPlugins()
initStatic__ExpertSleepersEncoders(); initStatic__ExpertSleepersEncoders();
initStatic__Extratone(); initStatic__Extratone();
initStatic__FehlerFabrik(); initStatic__FehlerFabrik();
#ifdef WITH_FUNDAMENTAL
initStatic__Fundamental(); initStatic__Fundamental();
#endif
initStatic__GlueTheGiant(); initStatic__GlueTheGiant();
initStatic__GoodSheperd(); initStatic__GoodSheperd();
initStatic__GrandeModular(); initStatic__GrandeModular();