From a7bbf7a741a76f01059ca399ad27f1f4bcf665a1 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Fri, 30 Sep 2011 23:07:15 -0700 Subject: [PATCH] Rename LOWPASSFREQCUTOFF to LOWPASSFREQREF --- Alc/ALu.c | 4 ++-- Alc/alcEcho.c | 2 +- Alc/alcReverb.c | 2 +- OpenAL32/Include/alMain.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Alc/ALu.c b/Alc/ALu.c index 8f49ddd3..433e1d2e 100644 --- a/Alc/ALu.c +++ b/Alc/ALu.c @@ -328,7 +328,7 @@ ALvoid CalcNonAttnSourceParams(ALsource *ALSource, const ALCcontext *ALContext) /* Update filter coefficients. Calculations based on the I3DL2 * spec. */ - cw = aluCos(F_PI*2.0f * LOWPASSFREQCUTOFF / Frequency); + cw = aluCos(F_PI*2.0f * LOWPASSFREQREF / Frequency); /* We use two chained one-pole filters, so we need to take the * square root of the squared gain, which is the same as the base @@ -797,7 +797,7 @@ ALvoid CalcSourceParams(ALsource *ALSource, const ALCcontext *ALContext) ALSource->Params.Send[i].WetGain = WetGain[i]; /* Update filter coefficients. */ - cw = aluCos(F_PI*2.0f * LOWPASSFREQCUTOFF / Frequency); + cw = aluCos(F_PI*2.0f * LOWPASSFREQREF / Frequency); ALSource->Params.iirFilter.coeff = lpCoeffCalc(DryGainHF, cw); for(i = 0;i < NumSends;i++) diff --git a/Alc/alcEcho.c b/Alc/alcEcho.c index 1d2afcf0..9bfb19b3 100644 --- a/Alc/alcEcho.c +++ b/Alc/alcEcho.c @@ -111,7 +111,7 @@ static ALvoid EchoUpdate(ALeffectState *effect, ALCcontext *Context, const ALeff state->FeedGain = Slot->effect.Echo.Feedback; - cw = aluCos(F_PI*2.0f * LOWPASSFREQCUTOFF / frequency); + cw = aluCos(F_PI*2.0f * LOWPASSFREQREF / frequency); g = 1.0f - Slot->effect.Echo.Damping; state->iirFilter.coeff = lpCoeffCalc(g, cw); diff --git a/Alc/alcReverb.c b/Alc/alcReverb.c index 52fb86da..c6d0f33c 100644 --- a/Alc/alcReverb.c +++ b/Alc/alcReverb.c @@ -1112,7 +1112,7 @@ static ALvoid ReverbUpdate(ALeffectState *effect, ALCcontext *Context, const ALe // Calculate the master low-pass filter (from the master effect HF gain). if(isEAX) cw = CalcI3DL2HFreq(Slot->effect.Reverb.HFReference, frequency); - else cw = CalcI3DL2HFreq(LOWPASSFREQCUTOFF, frequency); + else cw = CalcI3DL2HFreq(LOWPASSFREQREF, frequency); // This is done with 2 chained 1-pole filters, so no need to square g. State->LpFilter.coeff = lpCoeffCalc(Slot->effect.Reverb.GainHF, cw); diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index f69ea967..36c84153 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -446,7 +446,7 @@ extern "C" { #define SPEEDOFSOUNDMETRESPERSEC (343.3f) #define AIRABSORBGAINHF (0.99426f) /* -0.05dB */ -#define LOWPASSFREQCUTOFF (5000) +#define LOWPASSFREQREF (5000) struct Hrtf;