From 5eba049074e375c60674743e0004e7f14e233788 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Sat, 21 May 2022 10:53:03 +0100
Subject: [PATCH] Another build conflict fix

Signed-off-by: falkTX <falktx@falktx.com>
---
 plugins/Makefile    | 2 +-
 plugins/plugins.cpp | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/Makefile b/plugins/Makefile
index 24cfe7c..f960f95 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -323,7 +323,7 @@ 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 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
 
 # --------------------------------------------------------------
diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp
index 9e27b00..8ed6b8f 100644
--- a/plugins/plugins.cpp
+++ b/plugins/plugins.cpp
@@ -80,11 +80,13 @@ extern Model* modelBlank;
 // AS
 #define modelADSR modelASADSR
 #define modelVCA modelASVCA
+#define modelWaveShaper modelASWaveShaper
 #define LedLight ASLedLight
 #define YellowRedLight ASYellowRedLight
 #include "AS/src/AS.hpp"
 #undef modelADSR
 #undef modelVCA
+#undef modelWaveShaper
 #undef LedLight
 #undef YellowRedLight
 
@@ -1125,6 +1127,7 @@ static void initStatic__AS()
     {
 #define modelADSR modelASADSR
 #define modelVCA modelASVCA
+#define modelWaveShaper modelASWaveShaper
         //OSCILLATORS
         p->addModel(modelSineOsc);
         p->addModel(modelSawOsc);
@@ -1175,6 +1178,7 @@ static void initStatic__AS()
         p->addModel(modelBlankPanelSpecial);
 #undef modelADSR
 #undef modelVCA
+#undef modelWaveShaper
     }
 }