diff options
Diffstat (limited to 'Alc')
| -rw-r--r-- | Alc/filters/nfc.c | 8 | ||||
| -rw-r--r-- | Alc/filters/nfc.h | 6 | ||||
| -rw-r--r-- | Alc/mixvoice.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/Alc/filters/nfc.c b/Alc/filters/nfc.c index b9006955..3b8696f7 100644 --- a/Alc/filters/nfc.c +++ b/Alc/filters/nfc.c @@ -221,7 +221,7 @@ void NfcFilterAdjust(NfcFilter *nfc, const float w0) } -void NfcFilterUpdate1(NfcFilter *nfc, float *restrict dst, const float *restrict src, const int count) +void NfcFilterProcess1(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, float *restrict dst, const float *restrict nfc->first.history[0] = z1; } -void NfcFilterUpdate2(NfcFilter *nfc, float *restrict dst, const float *restrict src, const int count) +void NfcFilterProcess2(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, float *restrict dst, const float *restrict nfc->second.history[1] = z2; } -void NfcFilterUpdate3(NfcFilter *nfc, float *restrict dst, const float *restrict src, const int count) +void NfcFilterProcess3(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]; @@ -401,7 +401,7 @@ static void NfcFilterAdjust(NfcFilter *nfc, const float distance) } } -static float NfcFilterUpdate(const float in, NfcFilter *nfc) +static float NfcFilterProcess(const float in, NfcFilter *nfc) { int i; float out = in * nfc->coeffs[0]; diff --git a/Alc/filters/nfc.h b/Alc/filters/nfc.h index f0987d97..8c6cc6ae 100644 --- a/Alc/filters/nfc.h +++ b/Alc/filters/nfc.h @@ -38,12 +38,12 @@ void NfcFilterCreate(NfcFilter *nfc, const float w0, const float w1); void NfcFilterAdjust(NfcFilter *nfc, const float w0); /* Near-field control filter for first-order ambisonic channels (1-3). */ -void NfcFilterUpdate1(NfcFilter *nfc, float *restrict dst, const float *restrict src, const int count); +void NfcFilterProcess1(NfcFilter *nfc, float *restrict dst, const float *restrict src, const int count); /* Near-field control filter for second-order ambisonic channels (4-8). */ -void NfcFilterUpdate2(NfcFilter *nfc, float *restrict dst, const float *restrict src, const int count); +void NfcFilterProcess2(NfcFilter *nfc, float *restrict dst, const float *restrict src, const int count); /* 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); +void NfcFilterProcess3(NfcFilter *nfc, float *restrict dst, const float *restrict src, const int count); #endif /* FILTER_NFC_H */ diff --git a/Alc/mixvoice.c b/Alc/mixvoice.c index a9d12821..8a382ffd 100644 --- a/Alc/mixvoice.c +++ b/Alc/mixvoice.c @@ -564,7 +564,7 @@ ALboolean MixSource(ALvoice *voice, ALuint SourceID, ALCcontext *Context, ALsize #define APPLY_NFC_MIX(order) \ if(voice->Direct.ChannelsPerOrder[order] > 0) \ { \ - NfcFilterUpdate##order(&parms->NFCtrlFilter, nfcsamples, samples, \ + NfcFilterProcess##order(&parms->NFCtrlFilter, nfcsamples, samples, \ DstBufferSize); \ MixSamples(nfcsamples, voice->Direct.ChannelsPerOrder[order], \ voice->Direct.Buffer+chanoffset, parms->Gains.Current+chanoffset, \ |