From 8448b94c0bf3f0ddbd040b25a68ff0ca2dcc37bd Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Sun, 6 Oct 2013 09:23:53 -0700 Subject: Rename Filter param member to LpFilter --- Alc/ALu.c | 8 ++++---- Alc/mixer.c | 4 ++-- OpenAL32/Include/alSource.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Alc/ALu.c b/Alc/ALu.c index 50a21755..8274f265 100644 --- a/Alc/ALu.c +++ b/Alc/ALu.c @@ -449,7 +449,7 @@ ALvoid CalcNonAttnSourceParams(ALsource *ALSource, const ALCcontext *ALContext) { ALfloat gain = maxf(0.01f, DryGainHF); for(c = 0;c < num_channels;c++) - ALfilterState_setParams(&ALSource->Params.Direct.Filter[c], + ALfilterState_setParams(&ALSource->Params.Direct.LpFilter[c], ALfilterType_HighShelf, gain, (ALfloat)LOWPASSFREQREF/Frequency, 0.0f); } @@ -457,7 +457,7 @@ ALvoid CalcNonAttnSourceParams(ALsource *ALSource, const ALCcontext *ALContext) { ALfloat gain = maxf(0.01f, WetGainHF[i]); for(c = 0;c < num_channels;c++) - ALfilterState_setParams(&ALSource->Params.Send[i].Filter[c], + ALfilterState_setParams(&ALSource->Params.Send[i].LpFilter[c], ALfilterType_HighShelf, gain, (ALfloat)LOWPASSFREQREF/Frequency, 0.0f); } @@ -893,14 +893,14 @@ ALvoid CalcSourceParams(ALsource *ALSource, const ALCcontext *ALContext) { ALfloat gain = maxf(0.01f, DryGainHF); - ALfilterState_setParams(&ALSource->Params.Direct.Filter[0], + ALfilterState_setParams(&ALSource->Params.Direct.LpFilter[0], ALfilterType_HighShelf, gain, (ALfloat)LOWPASSFREQREF/Frequency, 0.0f); } for(i = 0;i < NumSends;i++) { ALfloat gain = maxf(0.01f, WetGainHF[i]); - ALfilterState_setParams(&ALSource->Params.Send[i].Filter[0], + ALfilterState_setParams(&ALSource->Params.Send[i].LpFilter[0], ALfilterType_HighShelf, gain, (ALfloat)LOWPASSFREQREF/Frequency, 0.0f); } diff --git a/Alc/mixer.c b/Alc/mixer.c index 0dafe874..3039f29f 100644 --- a/Alc/mixer.c +++ b/Alc/mixer.c @@ -328,7 +328,7 @@ ALvoid MixSource(ALsource *Source, ALCdevice *Device, ALuint SamplesToDo) { DirectParams *directparms = &Source->Params.Direct; - DoFilter(&directparms->Filter[chan], SrcData, ResampledData, + DoFilter(&directparms->LpFilter[chan], SrcData, ResampledData, DstBufferSize); Source->Params.DryMix(directparms, SrcData, chan, OutPos, SamplesToDo, DstBufferSize); @@ -340,7 +340,7 @@ ALvoid MixSource(ALsource *Source, ALCdevice *Device, ALuint SamplesToDo) if(!sendparms->Slot) continue; - DoFilter(&sendparms->Filter[chan], SrcData, ResampledData, + DoFilter(&sendparms->LpFilter[chan], SrcData, ResampledData, DstBufferSize); Source->Params.WetMix(sendparms, SrcData, OutPos, SamplesToDo, DstBufferSize); diff --git a/OpenAL32/Include/alSource.h b/OpenAL32/Include/alSource.h index e049d987..03da250f 100644 --- a/OpenAL32/Include/alSource.h +++ b/OpenAL32/Include/alSource.h @@ -62,7 +62,7 @@ typedef struct DirectParams { * target (eg. FrontLeft). Not used with HRTF. */ ALfloat Gains[MAX_INPUT_CHANNELS][MaxChannels]; - ALfilterState Filter[MAX_INPUT_CHANNELS]; + ALfilterState LpFilter[MAX_INPUT_CHANNELS]; } DirectParams; typedef struct SendParams { @@ -72,7 +72,7 @@ typedef struct SendParams { * output buffer. */ ALfloat Gain; - ALfilterState Filter[MAX_INPUT_CHANNELS]; + ALfilterState LpFilter[MAX_INPUT_CHANNELS]; } SendParams; -- cgit v1.2.3