diff options
Diffstat (limited to 'Alc')
-rw-r--r-- | Alc/ALu.c | 2 | ||||
-rw-r--r-- | Alc/bformatdec.c | 1 | ||||
-rw-r--r-- | Alc/converter.c | 2 | ||||
-rw-r--r-- | Alc/effects/reverb.c | 1 | ||||
-rw-r--r-- | Alc/mixer/defs.h (renamed from Alc/mixer_defs.h) | 0 | ||||
-rw-r--r-- | Alc/mixer/mixer_c.c (renamed from Alc/mixer_c.c) | 1 | ||||
-rw-r--r-- | Alc/mixer/mixer_inc.c (renamed from Alc/mixer_inc.c) | 2 | ||||
-rw-r--r-- | Alc/mixer/mixer_neon.c (renamed from Alc/mixer_neon.c) | 2 | ||||
-rw-r--r-- | Alc/mixer/mixer_sse.c (renamed from Alc/mixer_sse.c) | 2 | ||||
-rw-r--r-- | Alc/mixer/mixer_sse2.c (renamed from Alc/mixer_sse2.c) | 2 | ||||
-rw-r--r-- | Alc/mixer/mixer_sse3.c (renamed from Alc/mixer_sse3.c) | 0 | ||||
-rw-r--r-- | Alc/mixer/mixer_sse41.c (renamed from Alc/mixer_sse41.c) | 2 | ||||
-rw-r--r-- | Alc/mixvoice.c (renamed from Alc/mixer.c) | 2 |
13 files changed, 9 insertions, 10 deletions
@@ -40,9 +40,9 @@ #include "static_assert.h" #include "ringbuffer.h" +#include "mixer/defs.h" #include "fpu_modes.h" #include "cpu_caps.h" -#include "mixer_defs.h" #include "bsinc_inc.h" #include "backends/base.h" diff --git a/Alc/bformatdec.c b/Alc/bformatdec.c index 28dbc742..ff0cd657 100644 --- a/Alc/bformatdec.c +++ b/Alc/bformatdec.c @@ -3,7 +3,6 @@ #include "bformatdec.h" #include "ambdec.h" -#include "mixer_defs.h" #include "alu.h" #include "bool.h" diff --git a/Alc/converter.c b/Alc/converter.c index 157073f2..6e28b4a6 100644 --- a/Alc/converter.c +++ b/Alc/converter.c @@ -4,7 +4,7 @@ #include "converter.h" #include "fpu_modes.h" -#include "mixer_defs.h" +#include "mixer/defs.h" SampleConverter *CreateSampleConverter(enum DevFmtType srcType, enum DevFmtType dstType, ALsizei numchans, ALsizei srcRate, ALsizei dstRate) diff --git a/Alc/effects/reverb.c b/Alc/effects/reverb.c index bd5553ad..ff1ee143 100644 --- a/Alc/effects/reverb.c +++ b/Alc/effects/reverb.c @@ -31,7 +31,6 @@ #include "alFilter.h" #include "alListener.h" #include "alError.h" -#include "mixer_defs.h" /* This is a user config option for modifying the overall output of the reverb * effect. diff --git a/Alc/mixer_defs.h b/Alc/mixer/defs.h index fe19cef4..fe19cef4 100644 --- a/Alc/mixer_defs.h +++ b/Alc/mixer/defs.h diff --git a/Alc/mixer_c.c b/Alc/mixer/mixer_c.c index 2346080a..0c33e9b0 100644 --- a/Alc/mixer_c.c +++ b/Alc/mixer/mixer_c.c @@ -6,6 +6,7 @@ #include "alu.h" #include "alSource.h" #include "alAuxEffectSlot.h" +#include "defs.h" static inline ALfloat do_point(const ALfloat *restrict vals, ALsizei UNUSED(frac)) diff --git a/Alc/mixer_inc.c b/Alc/mixer/mixer_inc.c index 3c9d4dc5..ad0daa63 100644 --- a/Alc/mixer_inc.c +++ b/Alc/mixer/mixer_inc.c @@ -4,9 +4,9 @@ #include "alSource.h" #include "hrtf.h" -#include "mixer_defs.h" #include "align.h" #include "alu.h" +#include "defs.h" static inline void ApplyCoeffs(ALsizei Offset, ALfloat (*restrict Values)[2], diff --git a/Alc/mixer_neon.c b/Alc/mixer/mixer_neon.c index 631e4f7c..b93d11fd 100644 --- a/Alc/mixer_neon.c +++ b/Alc/mixer/mixer_neon.c @@ -7,7 +7,7 @@ #include "alMain.h" #include "alu.h" #include "hrtf.h" -#include "mixer_defs.h" +#include "defs.h" const ALfloat *Resample_lerp_Neon(const InterpState* UNUSED(state), diff --git a/Alc/mixer_sse.c b/Alc/mixer/mixer_sse.c index 281b6f85..288661b2 100644 --- a/Alc/mixer_sse.c +++ b/Alc/mixer/mixer_sse.c @@ -9,7 +9,7 @@ #include "alSource.h" #include "alAuxEffectSlot.h" -#include "mixer_defs.h" +#include "defs.h" const ALfloat *Resample_bsinc_SSE(const InterpState *state, const ALfloat *restrict src, diff --git a/Alc/mixer_sse2.c b/Alc/mixer/mixer_sse2.c index 3f8224e7..19d07719 100644 --- a/Alc/mixer_sse2.c +++ b/Alc/mixer/mixer_sse2.c @@ -24,7 +24,7 @@ #include <emmintrin.h> #include "alu.h" -#include "mixer_defs.h" +#include "defs.h" const ALfloat *Resample_lerp_SSE2(const InterpState* UNUSED(state), diff --git a/Alc/mixer_sse3.c b/Alc/mixer/mixer_sse3.c index e69de29b..e69de29b 100644 --- a/Alc/mixer_sse3.c +++ b/Alc/mixer/mixer_sse3.c diff --git a/Alc/mixer_sse41.c b/Alc/mixer/mixer_sse41.c index 4f88d540..85fd0f5e 100644 --- a/Alc/mixer_sse41.c +++ b/Alc/mixer/mixer_sse41.c @@ -25,7 +25,7 @@ #include <smmintrin.h> #include "alu.h" -#include "mixer_defs.h" +#include "defs.h" const ALfloat *Resample_lerp_SSE41(const InterpState* UNUSED(state), diff --git a/Alc/mixer.c b/Alc/mixvoice.c index 7a7bbfe0..0e039115 100644 --- a/Alc/mixer.c +++ b/Alc/mixvoice.c @@ -39,7 +39,7 @@ #include "ringbuffer.h" #include "cpu_caps.h" -#include "mixer_defs.h" +#include "mixer/defs.h" static_assert((INT_MAX>>FRACTIONBITS)/MAX_PITCH > BUFFERSIZE, |