aboutsummaryrefslogtreecommitdiffstats
path: root/alc/effects
diff options
context:
space:
mode:
Diffstat (limited to 'alc/effects')
-rw-r--r--alc/effects/autowah.cpp4
-rw-r--r--alc/effects/base.h9
-rw-r--r--alc/effects/chorus.cpp4
-rw-r--r--alc/effects/compressor.cpp4
-rw-r--r--alc/effects/convolution.cpp4
-rw-r--r--alc/effects/dedicated.cpp4
-rw-r--r--alc/effects/distortion.cpp4
-rw-r--r--alc/effects/echo.cpp4
-rw-r--r--alc/effects/equalizer.cpp4
-rw-r--r--alc/effects/fshifter.cpp4
-rw-r--r--alc/effects/modulator.cpp4
-rw-r--r--alc/effects/null.cpp2
-rw-r--r--alc/effects/pshifter.cpp4
-rw-r--r--alc/effects/reverb.cpp4
-rw-r--r--alc/effects/vmorpher.cpp4
15 files changed, 33 insertions, 30 deletions
diff --git a/alc/effects/autowah.cpp b/alc/effects/autowah.cpp
index 6016b8ab..9c2ec335 100644
--- a/alc/effects/autowah.cpp
+++ b/alc/effects/autowah.cpp
@@ -26,6 +26,8 @@
#include <iterator>
#include <utility>
+#include "alc/effects/base.h"
+#include "alc/effectslot.h"
#include "almalloc.h"
#include "alnumeric.h"
#include "alspan.h"
@@ -35,8 +37,6 @@
#include "core/devformat.h"
#include "core/device.h"
#include "core/mixer.h"
-#include "effects/base.h"
-#include "effectslot.h"
#include "intrusive_ptr.h"
#include "math_defs.h"
diff --git a/alc/effects/base.h b/alc/effects/base.h
index 6c31ae0c..1fb339aa 100644
--- a/alc/effects/base.h
+++ b/alc/effects/base.h
@@ -1,18 +1,21 @@
#ifndef EFFECTS_BASE_H
#define EFFECTS_BASE_H
-#include <cstddef>
+#include <stddef.h>
#include "albyte.h"
-#include "alcmain.h"
#include "almalloc.h"
#include "alspan.h"
#include "atomic.h"
+#include "core/bufferline.h"
#include "intrusive_ptr.h"
+struct BufferStorage;
struct ContextBase;
+struct DeviceBase;
struct EffectSlot;
-struct BufferStorage;
+struct MixParams;
+struct RealMixParams;
/** Target gain for the reverb decay feedback reaching the decay time. */
diff --git a/alc/effects/chorus.cpp b/alc/effects/chorus.cpp
index 50cf1e40..3a1b9ae4 100644
--- a/alc/effects/chorus.cpp
+++ b/alc/effects/chorus.cpp
@@ -26,6 +26,8 @@
#include <cstdlib>
#include <iterator>
+#include "alc/effects/base.h"
+#include "alc/effectslot.h"
#include "almalloc.h"
#include "alnumeric.h"
#include "alspan.h"
@@ -36,8 +38,6 @@
#include "core/mixer.h"
#include "core/mixer/defs.h"
#include "core/resampler_limits.h"
-#include "effects/base.h"
-#include "effectslot.h"
#include "intrusive_ptr.h"
#include "math_defs.h"
#include "opthelpers.h"
diff --git a/alc/effects/compressor.cpp b/alc/effects/compressor.cpp
index 9a6f9b5d..030bfe08 100644
--- a/alc/effects/compressor.cpp
+++ b/alc/effects/compressor.cpp
@@ -37,6 +37,8 @@
#include <iterator>
#include <utility>
+#include "alc/effects/base.h"
+#include "alc/effectslot.h"
#include "almalloc.h"
#include "alnumeric.h"
#include "alspan.h"
@@ -46,8 +48,6 @@
#include "core/device.h"
#include "core/mixer.h"
#include "core/mixer/defs.h"
-#include "effects/base.h"
-#include "effectslot.h"
#include "intrusive_ptr.h"
struct ContextBase;
diff --git a/alc/effects/convolution.cpp b/alc/effects/convolution.cpp
index fd68ea41..ca5a7321 100644
--- a/alc/effects/convolution.cpp
+++ b/alc/effects/convolution.cpp
@@ -19,9 +19,11 @@
#include "albyte.h"
#include "alcomplex.h"
+#include "alc/effectslot.h"
#include "almalloc.h"
#include "alnumeric.h"
#include "alspan.h"
+#include "base.h"
#include "core/ambidefs.h"
#include "core/bufferline.h"
#include "core/buffer_storage.h"
@@ -31,8 +33,6 @@
#include "core/filters/splitter.h"
#include "core/fmt_traits.h"
#include "core/mixer.h"
-#include "effects/base.h"
-#include "effectslot.h"
#include "intrusive_ptr.h"
#include "math_defs.h"
#include "polyphase_resampler.h"
diff --git a/alc/effects/dedicated.cpp b/alc/effects/dedicated.cpp
index 6afd7baa..e7ea89e0 100644
--- a/alc/effects/dedicated.cpp
+++ b/alc/effects/dedicated.cpp
@@ -25,14 +25,14 @@
#include <cstdlib>
#include <iterator>
+#include "alc/effects/base.h"
+#include "alc/effectslot.h"
#include "almalloc.h"
#include "alspan.h"
#include "core/bufferline.h"
#include "core/devformat.h"
#include "core/device.h"
#include "core/mixer.h"
-#include "effects/base.h"
-#include "effectslot.h"
#include "intrusive_ptr.h"
struct ContextBase;
diff --git a/alc/effects/distortion.cpp b/alc/effects/distortion.cpp
index a3f287c0..26b4df8e 100644
--- a/alc/effects/distortion.cpp
+++ b/alc/effects/distortion.cpp
@@ -25,6 +25,8 @@
#include <cstdlib>
#include <iterator>
+#include "alc/effects/base.h"
+#include "alc/effectslot.h"
#include "almalloc.h"
#include "alnumeric.h"
#include "alspan.h"
@@ -35,8 +37,6 @@
#include "core/filters/biquad.h"
#include "core/mixer.h"
#include "core/mixer/defs.h"
-#include "effects/base.h"
-#include "effectslot.h"
#include "intrusive_ptr.h"
#include "math_defs.h"
diff --git a/alc/effects/echo.cpp b/alc/effects/echo.cpp
index 4fccabfe..4cdef37c 100644
--- a/alc/effects/echo.cpp
+++ b/alc/effects/echo.cpp
@@ -26,6 +26,8 @@
#include <iterator>
#include <tuple>
+#include "alc/effects/base.h"
+#include "alc/effectslot.h"
#include "almalloc.h"
#include "alnumeric.h"
#include "alspan.h"
@@ -35,8 +37,6 @@
#include "core/device.h"
#include "core/filters/biquad.h"
#include "core/mixer.h"
-#include "effects/base.h"
-#include "effectslot.h"
#include "intrusive_ptr.h"
#include "opthelpers.h"
#include "vector.h"
diff --git a/alc/effects/equalizer.cpp b/alc/effects/equalizer.cpp
index aedf537e..800330a3 100644
--- a/alc/effects/equalizer.cpp
+++ b/alc/effects/equalizer.cpp
@@ -27,6 +27,8 @@
#include <iterator>
#include <utility>
+#include "alc/effects/base.h"
+#include "alc/effectslot.h"
#include "almalloc.h"
#include "alspan.h"
#include "core/ambidefs.h"
@@ -36,8 +38,6 @@
#include "core/device.h"
#include "core/filters/biquad.h"
#include "core/mixer.h"
-#include "effects/base.h"
-#include "effectslot.h"
#include "intrusive_ptr.h"
diff --git a/alc/effects/fshifter.cpp b/alc/effects/fshifter.cpp
index e19809bb..c25aab82 100644
--- a/alc/effects/fshifter.cpp
+++ b/alc/effects/fshifter.cpp
@@ -27,6 +27,8 @@
#include <cstdlib>
#include <iterator>
+#include "alc/effects/base.h"
+#include "alc/effectslot.h"
#include "alcomplex.h"
#include "almalloc.h"
#include "alnumeric.h"
@@ -37,8 +39,6 @@
#include "core/device.h"
#include "core/mixer.h"
#include "core/mixer/defs.h"
-#include "effects/base.h"
-#include "effectslot.h"
#include "intrusive_ptr.h"
#include "math_defs.h"
diff --git a/alc/effects/modulator.cpp b/alc/effects/modulator.cpp
index ded35805..a518ff63 100644
--- a/alc/effects/modulator.cpp
+++ b/alc/effects/modulator.cpp
@@ -25,6 +25,8 @@
#include <cstdlib>
#include <iterator>
+#include "alc/effects/base.h"
+#include "alc/effectslot.h"
#include "almalloc.h"
#include "alnumeric.h"
#include "alspan.h"
@@ -35,8 +37,6 @@
#include "core/device.h"
#include "core/filters/biquad.h"
#include "core/mixer.h"
-#include "effects/base.h"
-#include "effectslot.h"
#include "intrusive_ptr.h"
#include "math_defs.h"
diff --git a/alc/effects/null.cpp b/alc/effects/null.cpp
index 1413909f..cda1420e 100644
--- a/alc/effects/null.cpp
+++ b/alc/effects/null.cpp
@@ -5,8 +5,8 @@
#include "almalloc.h"
#include "alspan.h"
+#include "base.h"
#include "core/bufferline.h"
-#include "effects/base.h"
#include "intrusive_ptr.h"
struct ContextBase;
diff --git a/alc/effects/pshifter.cpp b/alc/effects/pshifter.cpp
index 5bf813e5..26115605 100644
--- a/alc/effects/pshifter.cpp
+++ b/alc/effects/pshifter.cpp
@@ -27,6 +27,8 @@
#include <cstdlib>
#include <iterator>
+#include "alc/effects/base.h"
+#include "alc/effectslot.h"
#include "alcomplex.h"
#include "almalloc.h"
#include "alnumeric.h"
@@ -36,8 +38,6 @@
#include "core/device.h"
#include "core/mixer.h"
#include "core/mixer/defs.h"
-#include "effects/base.h"
-#include "effectslot.h"
#include "intrusive_ptr.h"
#include "math_defs.h"
diff --git a/alc/effects/reverb.cpp b/alc/effects/reverb.cpp
index 0db27210..d6f1dbbf 100644
--- a/alc/effects/reverb.cpp
+++ b/alc/effects/reverb.cpp
@@ -28,6 +28,8 @@
#include <numeric>
#include <stdint.h>
+#include "alc/effects/base.h"
+#include "alc/effectslot.h"
#include "almalloc.h"
#include "alnumeric.h"
#include "alspan.h"
@@ -40,8 +42,6 @@
#include "core/filters/splitter.h"
#include "core/mixer.h"
#include "core/mixer/defs.h"
-#include "effects/base.h"
-#include "effectslot.h"
#include "intrusive_ptr.h"
#include "math_defs.h"
#include "opthelpers.h"
diff --git a/alc/effects/vmorpher.cpp b/alc/effects/vmorpher.cpp
index c3790e30..6c419ba2 100644
--- a/alc/effects/vmorpher.cpp
+++ b/alc/effects/vmorpher.cpp
@@ -38,6 +38,8 @@
#include <functional>
#include <iterator>
+#include "alc/effects/base.h"
+#include "alc/effectslot.h"
#include "almalloc.h"
#include "alnumeric.h"
#include "alspan.h"
@@ -47,8 +49,6 @@
#include "core/devformat.h"
#include "core/device.h"
#include "core/mixer.h"
-#include "effects/base.h"
-#include "effectslot.h"
#include "intrusive_ptr.h"
#include "math_defs.h"