aboutsummaryrefslogtreecommitdiffstats
path: root/Alc
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2018-12-25 10:28:02 -0800
committerChris Robinson <[email protected]>2018-12-25 10:28:02 -0800
commit8336de665306e3d1669b9af675b3cf39f0bcbc4a (patch)
tree50b8d804d553ff74ef66671c68779e95f049a778 /Alc
parent9e19acd9e1bf4627d99a0ef87757da4c227ef2db (diff)
Rename a couple filter files for consistency
Diffstat (limited to 'Alc')
-rw-r--r--Alc/effects/autowah.cpp2
-rw-r--r--Alc/effects/chorus.cpp2
-rw-r--r--Alc/effects/distortion.cpp2
-rw-r--r--Alc/effects/echo.cpp2
-rw-r--r--Alc/effects/equalizer.cpp2
-rw-r--r--Alc/effects/modulator.cpp2
-rw-r--r--Alc/effects/reverb.cpp2
-rw-r--r--Alc/filters/biquad.cpp (renamed from Alc/filters/filter.cpp)2
-rw-r--r--Alc/filters/biquad.h (renamed from Alc/filters/defs.h)7
9 files changed, 12 insertions, 11 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 */