Move the filters to core

7 files changed, 19 insertions, 21 deletions

diff --git a/alc/effects/autowah.cpp b/alc/effects/autowah.cpp
index 5ac51e32..f2ffab44 100644
--- a/alc/effects/autowah.cpp
+++ b/alc/effects/autowah.cpp
@@ -29,7 +29,7 @@
 #include "alcmain.h"
 #include "alcontext.h"
 #include "alu.h"
-#include "filters/biquad.h"
+#include "core/filters/biquad.h"
 #include "vecmat.h"
 
 namespace {
diff --git a/alc/effects/convolution.cpp b/alc/effects/convolution.cpp
index e191e7bc..2442f97e 100644
--- a/alc/effects/convolution.cpp
+++ b/alc/effects/convolution.cpp
@@ -8,7 +8,6 @@
 #include "AL/al.h"
 #include "AL/alc.h"
 
-#include "al/auxeffectslot.h"
 #include "alcmain.h"
 #include "alcomplex.h"
 #include "alcontext.h"
@@ -17,8 +16,9 @@
 #include "ambidefs.h"
 #include "bformatdec.h"
 #include "buffer_storage.h"
+#include "core/filters/splitter.h"
 #include "effects/base.h"
-#include "filters/splitter.h"
+#include "effectslot.h"
 #include "fmt_traits.h"
 #include "logging.h"
 #include "polyphase_resampler.h"
diff --git a/alc/effects/distortion.cpp b/alc/effects/distortion.cpp
index 757244c5..65f8977b 100644
--- a/alc/effects/distortion.cpp
+++ b/alc/effects/distortion.cpp
@@ -24,11 +24,10 @@
 #include <cmath>
 #include <cstdlib>
 
-#include "al/auxeffectslot.h"
 #include "alcmain.h"
 #include "alcontext.h"
-#include "alu.h"
-#include "filters/biquad.h"
+#include "core/filters/biquad.h"
+#include "effectslot.h"
 
 
 namespace {
diff --git a/alc/effects/echo.cpp b/alc/effects/echo.cpp
index a50d3c61..c030ac5b 100644
--- a/alc/effects/echo.cpp
+++ b/alc/effects/echo.cpp
@@ -25,17 +25,19 @@
 
 #include <algorithm>
 
-#include "al/auxeffectslot.h"
-#include "al/filter.h"
+#include "AL/efx.h"
+
 #include "alcmain.h"
 #include "alcontext.h"
-#include "alu.h"
-#include "filters/biquad.h"
+#include "core/filters/biquad.h"
+#include "effectslot.h"
 #include "vector.h"
 
 
 namespace {
 
+constexpr float LowpassFreqRef{5000.0f};
+
 struct EchoState final : public EffectState {
     al::vector<float,16> mSampleBuffer;
 
@@ -95,7 +97,7 @@ void EchoState::update(const ALCcontext *context, const EffectSlot *slot,
     mTap[1].delay = float2uint(props->Echo.LRDelay*frequency + 0.5f) + mTap[0].delay;
 
     const float gainhf{maxf(1.0f - props->Echo.Damping, 0.0625f)}; /* Limit -24dB */
-    mFilter.setParamsFromSlope(BiquadType::HighShelf, LOWPASSFREQREF/frequency, gainhf, 1.0f);
+    mFilter.setParamsFromSlope(BiquadType::HighShelf, LowpassFreqRef/frequency, gainhf, 1.0f);
 
     mFeedGain = props->Echo.Feedback;
 
diff --git a/alc/effects/equalizer.cpp b/alc/effects/equalizer.cpp
index 19d38498..c311a941 100644
--- a/alc/effects/equalizer.cpp
+++ b/alc/effects/equalizer.cpp
@@ -26,11 +26,10 @@
 #include <algorithm>
 #include <functional>
 
-#include "al/auxeffectslot.h"
 #include "alcmain.h"
 #include "alcontext.h"
-#include "alu.h"
-#include "filters/biquad.h"
+#include "core/filters/biquad.h"
+#include "effectslot.h"
 #include "vecmat.h"
 
 
diff --git a/alc/effects/modulator.cpp b/alc/effects/modulator.cpp
index 7e4f9fc0..a0af9890 100644
--- a/alc/effects/modulator.cpp
+++ b/alc/effects/modulator.cpp
@@ -26,11 +26,10 @@
 #include <cmath>
 #include <algorithm>
 
-#include "al/auxeffectslot.h"
 #include "alcmain.h"
 #include "alcontext.h"
-#include "alu.h"
-#include "filters/biquad.h"
+#include "core/filters/biquad.h"
+#include "effectslot.h"
 #include "vecmat.h"
 
 
diff --git a/alc/effects/reverb.cpp b/alc/effects/reverb.cpp
index 6471b210..a4b423c7 100644
--- a/alc/effects/reverb.cpp
+++ b/alc/effects/reverb.cpp
@@ -29,13 +29,12 @@
 #include <algorithm>
 #include <functional>
 
-#include "al/auxeffectslot.h"
-#include "al/listener.h"
 #include "alcmain.h"
 #include "alcontext.h"
-#include "alu.h"
+#include "alnumeric.h"
 #include "bformatdec.h"
-#include "filters/biquad.h"
+#include "core/filters/biquad.h"
+#include "effectslot.h"
 #include "vector.h"
 #include "vecmat.h"