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

Another build conflict fix

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

2
plugins/Makefile
View file

@ -323,7 +323,7 @@ PLUGIN_FILES += $(filter-out AS/src/AS.cpp,$(wildcard AS/src/*.cpp))
PLUGIN_FILES += AS/freeverb/revmodel.cpp PLUGIN_FILES += AS/freeverb/revmodel.cpp
# modules/types which are present in other plugins # modules/types which are present in other plugins
AS_CUSTOM = ADSR BpmDisplayWidget LabelDisplayWidget LedLight LowFrequencyOscillator SigDisplayWidget VCA YellowRedLight allpass comb revmodel AS_CUSTOM = ADSR BpmDisplayWidget LabelDisplayWidget LedLight LowFrequencyOscillator SigDisplayWidget VCA WaveShaper YellowRedLight allpass comb revmodel
AS_CUSTOM_PER_FILE = NumberDisplayWidget AS_CUSTOM_PER_FILE = NumberDisplayWidget
# -------------------------------------------------------------- # --------------------------------------------------------------

4
plugins/plugins.cpp
View file

@ -80,11 +80,13 @@ extern Model* modelBlank;
// AS // AS
#define modelADSR modelASADSR #define modelADSR modelASADSR
#define modelVCA modelASVCA #define modelVCA modelASVCA
#define modelWaveShaper modelASWaveShaper
#define LedLight ASLedLight #define LedLight ASLedLight
#define YellowRedLight ASYellowRedLight #define YellowRedLight ASYellowRedLight
#include "AS/src/AS.hpp" #include "AS/src/AS.hpp"
#undef modelADSR #undef modelADSR
#undef modelVCA #undef modelVCA
#undef modelWaveShaper
#undef LedLight #undef LedLight
#undef YellowRedLight #undef YellowRedLight
@ -1125,6 +1127,7 @@ static void initStatic__AS()
{ {
#define modelADSR modelASADSR #define modelADSR modelASADSR
#define modelVCA modelASVCA #define modelVCA modelASVCA
#define modelWaveShaper modelASWaveShaper
//OSCILLATORS //OSCILLATORS
p->addModel(modelSineOsc); p->addModel(modelSineOsc);
p->addModel(modelSawOsc); p->addModel(modelSawOsc);
@ -1175,6 +1178,7 @@ static void initStatic__AS()
p->addModel(modelBlankPanelSpecial); p->addModel(modelBlankPanelSpecial);
#undef modelADSR #undef modelADSR
#undef modelVCA #undef modelVCA
#undef modelWaveShaper
} }
} }