diff options
author | Chris Robinson <[email protected]> | 2018-04-04 18:07:46 -0700 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2018-04-04 18:07:46 -0700 |
commit | 9c5307a48a58959a564be1999b119a87b7cdb8e0 (patch) | |
tree | 84842432f646d1ce059ba67293b4edd0fc0bd798 /Alc/effects/equalizer.c | |
parent | b1fe40586192dc15f92d0476c85e9f9daa2a31f0 (diff) |
Rename BiquadState to BiquadFilter
Diffstat (limited to 'Alc/effects/equalizer.c')
-rw-r--r-- | Alc/effects/equalizer.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Alc/effects/equalizer.c b/Alc/effects/equalizer.c index 3174511a..8ff56fb5 100644 --- a/Alc/effects/equalizer.c +++ b/Alc/effects/equalizer.c @@ -81,7 +81,7 @@ typedef struct ALequalizerState { ALfloat TargetGains[MAX_OUTPUT_CHANNELS]; /* Effect parameters */ - BiquadState filter[4]; + BiquadFilter filter[4]; } Chans[MAX_EFFECT_CHANNELS]; ALfloat SampleBuffer[MAX_EFFECT_CHANNELS][BUFFERSIZE]; @@ -114,7 +114,7 @@ static ALboolean ALequalizerState_deviceUpdate(ALequalizerState *state, ALCdevic for(i = 0; i < MAX_EFFECT_CHANNELS;i++) { for(j = 0;j < 4;j++) - BiquadState_clear(&state->Chans[i].filter[j]); + BiquadFilter_clear(&state->Chans[i].filter[j]); for(j = 0;j < MAX_OUTPUT_CHANNELS;j++) state->Chans[i].CurrentGains[j] = 0.0f; } @@ -140,13 +140,13 @@ static ALvoid ALequalizerState_update(ALequalizerState *state, const ALCcontext */ gain = maxf(sqrtf(props->Equalizer.LowGain), 0.0625f); /* Limit -24dB */ f0norm = props->Equalizer.LowCutoff/frequency; - BiquadState_setParams(&state->Chans[0].filter[0], BiquadType_LowShelf, + BiquadFilter_setParams(&state->Chans[0].filter[0], BiquadType_LowShelf, gain, f0norm, calc_rcpQ_from_slope(gain, 0.75f) ); gain = maxf(props->Equalizer.Mid1Gain, 0.0625f); f0norm = props->Equalizer.Mid1Center/frequency; - BiquadState_setParams(&state->Chans[0].filter[1], BiquadType_Peaking, + BiquadFilter_setParams(&state->Chans[0].filter[1], BiquadType_Peaking, gain, f0norm, calc_rcpQ_from_bandwidth( f0norm, props->Equalizer.Mid1Width ) @@ -154,7 +154,7 @@ static ALvoid ALequalizerState_update(ALequalizerState *state, const ALCcontext gain = maxf(props->Equalizer.Mid2Gain, 0.0625f); f0norm = props->Equalizer.Mid2Center/frequency; - BiquadState_setParams(&state->Chans[0].filter[2], BiquadType_Peaking, + BiquadFilter_setParams(&state->Chans[0].filter[2], BiquadType_Peaking, gain, f0norm, calc_rcpQ_from_bandwidth( f0norm, props->Equalizer.Mid2Width ) @@ -162,17 +162,17 @@ static ALvoid ALequalizerState_update(ALequalizerState *state, const ALCcontext gain = maxf(sqrtf(props->Equalizer.HighGain), 0.0625f); f0norm = props->Equalizer.HighCutoff/frequency; - BiquadState_setParams(&state->Chans[0].filter[3], BiquadType_HighShelf, + BiquadFilter_setParams(&state->Chans[0].filter[3], BiquadType_HighShelf, gain, f0norm, calc_rcpQ_from_slope(gain, 0.75f) ); /* Copy the filter coefficients for the other input channels. */ for(i = 1;i < MAX_EFFECT_CHANNELS;i++) { - BiquadState_copyParams(&state->Chans[i].filter[0], &state->Chans[0].filter[0]); - BiquadState_copyParams(&state->Chans[i].filter[1], &state->Chans[0].filter[1]); - BiquadState_copyParams(&state->Chans[i].filter[2], &state->Chans[0].filter[2]); - BiquadState_copyParams(&state->Chans[i].filter[3], &state->Chans[0].filter[3]); + BiquadFilter_copyParams(&state->Chans[i].filter[0], &state->Chans[0].filter[0]); + BiquadFilter_copyParams(&state->Chans[i].filter[1], &state->Chans[0].filter[1]); + BiquadFilter_copyParams(&state->Chans[i].filter[2], &state->Chans[0].filter[2]); + BiquadFilter_copyParams(&state->Chans[i].filter[3], &state->Chans[0].filter[3]); } } @@ -183,10 +183,10 @@ static ALvoid ALequalizerState_process(ALequalizerState *state, ALsizei SamplesT for(c = 0;c < MAX_EFFECT_CHANNELS;c++) { - BiquadState_process(&state->Chans[c].filter[0], temps[0], SamplesIn[c], SamplesToDo); - BiquadState_process(&state->Chans[c].filter[1], temps[1], temps[0], SamplesToDo); - BiquadState_process(&state->Chans[c].filter[2], temps[2], temps[1], SamplesToDo); - BiquadState_process(&state->Chans[c].filter[3], temps[3], temps[2], SamplesToDo); + BiquadFilter_process(&state->Chans[c].filter[0], temps[0], SamplesIn[c], SamplesToDo); + BiquadFilter_process(&state->Chans[c].filter[1], temps[1], temps[0], SamplesToDo); + BiquadFilter_process(&state->Chans[c].filter[2], temps[2], temps[1], SamplesToDo); + BiquadFilter_process(&state->Chans[c].filter[3], temps[3], temps[2], SamplesToDo); MixSamples(temps[3], NumChannels, SamplesOut, state->Chans[c].CurrentGains, state->Chans[c].TargetGains, |