Rename a couple filter files for consistency

11 files changed, 15 insertions, 14 deletions

diff --git a/Alc/effects/autowah.cpp b/Alc/effects/autowah.cpp
index 8590360a..b116cc0f 100644
--- a/Alc/effects/autowah.cpp
+++ b/Alc/effects/autowah.cpp
@@ -30,7 +30,7 @@
 #include "alAuxEffectSlot.h"
 #include "alError.h"
 #include "alu.h"
-#include "filters/defs.h"
+#include "filters/biquad.h"
 #include "vecmat.h"
 
 #define MIN_FREQ 20.0f
diff --git a/Alc/effects/chorus.cpp b/Alc/effects/chorus.cpp
index 9219ece5..1a89a015 100644
--- a/Alc/effects/chorus.cpp
+++ b/Alc/effects/chorus.cpp
@@ -30,7 +30,7 @@
 #include "alAuxEffectSlot.h"
 #include "alError.h"
 #include "alu.h"
-#include "filters/defs.h"
+#include "filters/biquad.h"
 #include "vector.h"
 
 
diff --git a/Alc/effects/distortion.cpp b/Alc/effects/distortion.cpp
index d094ee5f..e54ae455 100644
--- a/Alc/effects/distortion.cpp
+++ b/Alc/effects/distortion.cpp
@@ -30,7 +30,7 @@
 #include "alAuxEffectSlot.h"
 #include "alError.h"
 #include "alu.h"
-#include "filters/defs.h"
+#include "filters/biquad.h"
 
 
 struct ALdistortionState final : public EffectState {
diff --git a/Alc/effects/echo.cpp b/Alc/effects/echo.cpp
index f48f1e89..b774052a 100644
--- a/Alc/effects/echo.cpp
+++ b/Alc/effects/echo.cpp
@@ -31,7 +31,7 @@
 #include "alAuxEffectSlot.h"
 #include "alError.h"
 #include "alu.h"
-#include "filters/defs.h"
+#include "filters/biquad.h"
 #include "vector.h"
 
 
diff --git a/Alc/effects/equalizer.cpp b/Alc/effects/equalizer.cpp
index 443bf118..cb421914 100644
--- a/Alc/effects/equalizer.cpp
+++ b/Alc/effects/equalizer.cpp
@@ -31,7 +31,7 @@
 #include "alAuxEffectSlot.h"
 #include "alError.h"
 #include "alu.h"
-#include "filters/defs.h"
+#include "filters/biquad.h"
 #include "vecmat.h"
 
 
diff --git a/Alc/effects/modulator.cpp b/Alc/effects/modulator.cpp
index 2b62d66a..889d6a86 100644
--- a/Alc/effects/modulator.cpp
+++ b/Alc/effects/modulator.cpp
@@ -31,7 +31,7 @@
 #include "alAuxEffectSlot.h"
 #include "alError.h"
 #include "alu.h"
-#include "filters/defs.h"
+#include "filters/biquad.h"
 #include "vecmat.h"
 
 
diff --git a/Alc/effects/reverb.cpp b/Alc/effects/reverb.cpp
index 574f9e7f..d984ceab 100644
--- a/Alc/effects/reverb.cpp
+++ b/Alc/effects/reverb.cpp
@@ -33,7 +33,7 @@
 #include "alAuxEffectSlot.h"
 #include "alListener.h"
 #include "alError.h"
-#include "filters/defs.h"
+#include "filters/biquad.h"
 #include "vector.h"
 #include "vecmat.h"
 
diff --git a/Alc/filters/filter.cpp b/Alc/filters/biquad.cpp
index c9e7c9fe..c6266949 100644
--- a/Alc/filters/filter.cpp
+++ b/Alc/filters/biquad.cpp
@@ -7,7 +7,7 @@
 #include "AL/al.h"
 
 #include "alMain.h"
-#include "defs.h"
+#include "biquad.h"
 
 
 void BiquadFilter::setParams(BiquadType type, float gain, float f0norm, float rcpQ)
diff --git a/Alc/filters/defs.h b/Alc/filters/biquad.h
index b7628153..98085dbb 100644
--- a/Alc/filters/defs.h
+++ b/Alc/filters/biquad.h
@@ -1,7 +1,8 @@
-#ifndef ALC_FILTER_H
-#define ALC_FILTER_H
+#ifndef FILTERS_BIQUAD_H
+#define FILTERS_BIQUAD_H
 
 #include <cmath>
+#include <utility>
 
 #include "AL/al.h"
 #include "math_defs.h"
@@ -122,4 +123,4 @@ inline ALfloat calc_rcpQ_from_bandwidth(float f0norm, float bandwidth)
     return 2.0f*std::sinh(std::log(2.0f)/2.0f*bandwidth*w0/std::sin(w0));
 }
 
-#endif /* ALC_FILTER_H */
+#endif /* FILTERS_BIQUAD_H */
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e1d0081..270d2a4e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -752,8 +752,8 @@ SET(ALC_OBJS
     Alc/effects/null.cpp
     Alc/effects/pshifter.cpp
     Alc/effects/reverb.cpp
-    Alc/filters/defs.h
-    Alc/filters/filter.cpp
+    Alc/filters/biquad.h
+    Alc/filters/biquad.cpp
     Alc/filters/nfc.cpp
     Alc/filters/nfc.h
     Alc/filters/splitter.cpp
diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h
index 78733d8d..4620aeb6 100644
--- a/OpenAL32/Include/alu.h
+++ b/OpenAL32/Include/alu.h
@@ -18,7 +18,7 @@
 
 #include "hrtf.h"
 #include "math_defs.h"
-#include "filters/defs.h"
+#include "filters/biquad.h"
 #include "filters/nfc.h"
 #include "almalloc.h"