diff options
| -rw-r--r-- | Alc/filters/nfc.c (renamed from Alc/nfcfilter.c) | 10 | ||||
| -rw-r--r-- | Alc/filters/nfc.h (renamed from Alc/nfcfilter.h) | 8 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | OpenAL32/Include/alu.h | 2 |
4 files changed, 10 insertions, 12 deletions
diff --git a/Alc/nfcfilter.c b/Alc/filters/nfc.c index 57a3e28f..b9006955 100644 --- a/Alc/nfcfilter.c +++ b/Alc/filters/nfc.c @@ -1,9 +1,9 @@ #include "config.h" -#include "nfcfilter.h" +#include "nfc.h" -#include "alu.h" +#include <string.h> /* Near-field control filters are the basis for handling the near-field effect. @@ -221,7 +221,7 @@ void NfcFilterAdjust(NfcFilter *nfc, const float w0) } -void NfcFilterUpdate1(NfcFilter *nfc, ALfloat *restrict dst, const float *restrict src, const int count) +void NfcFilterUpdate1(NfcFilter *nfc, float *restrict dst, const float *restrict src, const int count) { const float b0 = nfc->first.coeffs[0]; const float a0 = nfc->first.coeffs[1]; @@ -243,7 +243,7 @@ void NfcFilterUpdate1(NfcFilter *nfc, ALfloat *restrict dst, const float *restri nfc->first.history[0] = z1; } -void NfcFilterUpdate2(NfcFilter *nfc, ALfloat *restrict dst, const float *restrict src, const int count) +void NfcFilterUpdate2(NfcFilter *nfc, float *restrict dst, const float *restrict src, const int count) { const float b0 = nfc->second.coeffs[0]; const float a00 = nfc->second.coeffs[1]; @@ -270,7 +270,7 @@ void NfcFilterUpdate2(NfcFilter *nfc, ALfloat *restrict dst, const float *restri nfc->second.history[1] = z2; } -void NfcFilterUpdate3(NfcFilter *nfc, ALfloat *restrict dst, const float *restrict src, const int count) +void NfcFilterUpdate3(NfcFilter *nfc, float *restrict dst, const float *restrict src, const int count) { const float b0 = nfc->third.coeffs[0]; const float a00 = nfc->third.coeffs[1]; diff --git a/Alc/nfcfilter.h b/Alc/filters/nfc.h index 0bf9a5c4..f0987d97 100644 --- a/Alc/nfcfilter.h +++ b/Alc/filters/nfc.h @@ -1,7 +1,5 @@ -#ifndef NFCFILTER_H -#define NFCFILTER_H - -#include "alMain.h" +#ifndef FILTER_NFC_H +#define FILTER_NFC_H struct NfcFilter1 { float g; @@ -48,4 +46,4 @@ void NfcFilterUpdate2(NfcFilter *nfc, float *restrict dst, const float *restrict /* Near-field control filter for third-order ambisonic channels (9-15). */ void NfcFilterUpdate3(NfcFilter *nfc, float *restrict dst, const float *restrict src, const int count); -#endif /* NFCFILTER_H */ +#endif /* FILTER_NFC_H */ diff --git a/CMakeLists.txt b/CMakeLists.txt index 1be64433..883c43d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -729,12 +729,12 @@ SET(ALC_OBJS Alc/ALc.c Alc/effects/pshifter.c Alc/effects/reverb.c Alc/filters/filter.c + Alc/filters/nfc.c Alc/helpers.c Alc/hrtf.c Alc/uhjfilter.c Alc/ambdec.c Alc/bformatdec.c - Alc/nfcfilter.c Alc/panning.c Alc/mixvoice.c Alc/mixer/mixer_c.c diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h index 341b3760..6113c256 100644 --- a/OpenAL32/Include/alu.h +++ b/OpenAL32/Include/alu.h @@ -15,9 +15,9 @@ #include "hrtf.h" #include "align.h" -#include "nfcfilter.h" #include "math_defs.h" #include "filters/defs.h" +#include "filters/nfc.h" #define MAX_PITCH (255) |