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

Reintroduce AS modules

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-05-21 03:57:57 +01:00
parent 7e1da35de7
commit 73af70de01
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
6 changed files with 104 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/AS Submodule

@ -0,0 +1 @@
Subproject commit 2284e4a3befb097b42ae30032147fd61226f64ff

19
plugins/Makefile
View file

@ -316,6 +316,16 @@ PLUGIN_FILES += AriaModules/src/Undular.cpp
# modules/types which are present in other plugins
ARIA_CUSTOM = Blank
# --------------------------------------------------------------
# AS
PLUGIN_FILES += $(filter-out AS/src/AS.cpp,$(wildcard AS/src/*.cpp))
PLUGIN_FILES += AS/freeverb/revmodel.cpp
# modules/types which are present in other plugins
AS_CUSTOM = ADSR LabelDisplayWidget LedLight LowFrequencyOscillator VCA YellowRedLight allpass comb revmodel
AS_CUSTOM_PER_FILE = NumberDisplayWidget
# --------------------------------------------------------------
# AudibleInstruments
@ -1292,6 +1302,15 @@ $(BUILD_DIR)/AriaModules/%.cpp.o: AriaModules/%.cpp
-DpluginInstance=pluginInstance__Aria \
-Wno-cast-function-type
$(BUILD_DIR)/AS/%.cpp.o: AS/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
$(foreach m,$(AS_CUSTOM),$(call custom_module_names,$(m),AS)) \
$(foreach m,$(AS_CUSTOM_PER_FILE),$(call custom_per_file_names,$(m),AS_$(shell basename $*))) \
-DpluginInstance=pluginInstance__AS \
-Wno-unused-private-field
$(BUILD_DIR)/AudibleInstruments/%.o: AudibleInstruments/%
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"

75
plugins/plugins.cpp
View file

@ -77,6 +77,17 @@ extern Model* modelUndular;
extern Model* modelBlank;
#undef modelBlank
// AS
#define modelADSR modelASADSR
#define modelVCA modelASVCA
#define LedLight ASLedLight
#define YellowRedLight ASYellowRedLight
#include "AS/src/AS.hpp"
#undef modelADSR
#undef modelVCA
#undef LedLight
#undef YellowRedLight
// AudibleInstruments
#include "AudibleInstruments/src/plugin.hpp"
@ -705,6 +716,7 @@ Plugin* pluginInstance__AmalgamatedHarmonics;
Plugin* pluginInstance__ArableInstruments;
Plugin* pluginInstance__AnimatedCircuits;
Plugin* pluginInstance__Aria;
Plugin* pluginInstance__AS;
Plugin* pluginInstance__AudibleInstruments;
extern Plugin* pluginInstance__Autinn;
Plugin* pluginInstance__Axioma;
@ -1100,6 +1112,68 @@ static void initStatic__Aria()
}
}
static void initStatic__AS()
{
Plugin* const p = new Plugin;
pluginInstance__AS = p;
const StaticPluginLoader spl(p, "AS");
if (spl.ok())
{
#define modelADSR modelASADSR
#define modelVCA modelASVCA
//OSCILLATORS
p->addModel(modelSineOsc);
p->addModel(modelSawOsc);
//TOOLS
p->addModel(modelADSR);
p->addModel(modelVCA);
p->addModel(modelQuadVCA);
p->addModel(modelTriLFO);
p->addModel(modelAtNuVrTr);
p->addModel(modelBPMClock);
p->addModel(modelSEQ16);
p->addModel(modelMixer2ch);
p->addModel(modelMixer4ch);
p->addModel(modelMixer8ch);
p->addModel(modelMonoVUmeter);
p->addModel(modelStereoVUmeter);
p->addModel(modelMultiple2_5);
p->addModel(modelMerge2_5);
p->addModel(modelSteps);
p->addModel(modelLaunchGate);
p->addModel(modelKillGate);
p->addModel(modelFlow);
p->addModel(modelSignalDelay);
p->addModel(modelTriggersMKI);
p->addModel(modelTriggersMKII);
p->addModel(modelTriggersMKIII);
p->addModel(modelBPMCalc);
p->addModel(modelBPMCalc2);
p->addModel(modelCv2T);
p->addModel(modelZeroCV2T);
p->addModel(modelReScale);
//EFFECTS
p->addModel(modelDelayPlusFx);
p->addModel(modelDelayPlusStereoFx);
p->addModel(modelPhaserFx);
p->addModel(modelReverbFx);
p->addModel(modelReverbStereoFx);
p->addModel(modelSuperDriveFx);
p->addModel(modelSuperDriveStereoFx);
p->addModel(modelTremoloFx);
p->addModel(modelTremoloStereoFx);
p->addModel(modelWaveShaper);
p->addModel(modelWaveShaperStereo);
//BLANK PANELS
p->addModel(modelBlankPanel4);
p->addModel(modelBlankPanel6);
p->addModel(modelBlankPanel8);
p->addModel(modelBlankPanelSpecial);
#undef modelADSR
#undef modelVCA
}
}
static void initStatic__AudibleInstruments()
{
Plugin* const p = new Plugin;
@ -2577,6 +2651,7 @@ void initStaticPlugins()
initStatic__AnimatedCircuits();
initStatic__ArableInstruments();
initStatic__Aria();
initStatic__AS();
initStatic__AudibleInstruments();
initStatic__Autinn();
initStatic__Axioma();