diff options
author | Chris Robinson <[email protected]> | 2018-01-13 09:14:46 -0800 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2018-01-13 09:14:46 -0800 |
commit | 78cb70a5f9f2782e1335aea03168ffee2fea0122 (patch) | |
tree | 7bb585fdfb3fd0a4c310d50c45de1b4092400535 /Alc/effects | |
parent | 16e4e0fa7c97d8b7273e590adc9432f317f93d57 (diff) |
Replace some freq_mult variable names with f0norm
The latter is a bit more descriptive as f0 is often used to denote the
reference frequency of a filter, so f0norm indicates the normalized reference
frequency (ref_freq / sample_rate).
Diffstat (limited to 'Alc/effects')
-rw-r--r-- | Alc/effects/equalizer.c | 22 | ||||
-rw-r--r-- | Alc/effects/reverb.c | 12 |
2 files changed, 17 insertions, 17 deletions
diff --git a/Alc/effects/equalizer.c b/Alc/effects/equalizer.c index 7df15380..bc84f87f 100644 --- a/Alc/effects/equalizer.c +++ b/Alc/effects/equalizer.c @@ -125,7 +125,7 @@ static ALvoid ALequalizerState_update(ALequalizerState *state, const ALCcontext { const ALCdevice *device = context->Device; ALfloat frequency = (ALfloat)device->Frequency; - ALfloat gain, freq_mult; + ALfloat gain, f0norm; ALuint i; STATIC_CAST(ALeffectState,state)->OutBuffer = device->FOAOut.Buffer; @@ -139,31 +139,31 @@ static ALvoid ALequalizerState_update(ALequalizerState *state, const ALCcontext * of the transition band. */ gain = maxf(sqrtf(props->Equalizer.LowGain), 0.0625f); /* Limit -24dB */ - freq_mult = props->Equalizer.LowCutoff/frequency; + f0norm = props->Equalizer.LowCutoff/frequency; ALfilterState_setParams(&state->Chans[0].filter[0], ALfilterType_LowShelf, - gain, freq_mult, calc_rcpQ_from_slope(gain, 0.75f) + gain, f0norm, calc_rcpQ_from_slope(gain, 0.75f) ); gain = maxf(props->Equalizer.Mid1Gain, 0.0625f); - freq_mult = props->Equalizer.Mid1Center/frequency; + f0norm = props->Equalizer.Mid1Center/frequency; ALfilterState_setParams(&state->Chans[0].filter[1], ALfilterType_Peaking, - gain, freq_mult, calc_rcpQ_from_bandwidth( - freq_mult, props->Equalizer.Mid1Width + gain, f0norm, calc_rcpQ_from_bandwidth( + f0norm, props->Equalizer.Mid1Width ) ); gain = maxf(props->Equalizer.Mid2Gain, 0.0625f); - freq_mult = props->Equalizer.Mid2Center/frequency; + f0norm = props->Equalizer.Mid2Center/frequency; ALfilterState_setParams(&state->Chans[0].filter[2], ALfilterType_Peaking, - gain, freq_mult, calc_rcpQ_from_bandwidth( - freq_mult, props->Equalizer.Mid2Width + gain, f0norm, calc_rcpQ_from_bandwidth( + f0norm, props->Equalizer.Mid2Width ) ); gain = maxf(sqrtf(props->Equalizer.HighGain), 0.0625f); - freq_mult = props->Equalizer.HighCutoff/frequency; + f0norm = props->Equalizer.HighCutoff/frequency; ALfilterState_setParams(&state->Chans[0].filter[3], ALfilterType_HighShelf, - gain, freq_mult, calc_rcpQ_from_slope(gain, 0.75f) + gain, f0norm, calc_rcpQ_from_slope(gain, 0.75f) ); /* Copy the filter coefficients for the other input channels. */ diff --git a/Alc/effects/reverb.c b/Alc/effects/reverb.c index f6cd2b04..49362e2a 100644 --- a/Alc/effects/reverb.c +++ b/Alc/effects/reverb.c @@ -1281,23 +1281,23 @@ static ALvoid ALreverbState_update(ALreverbState *State, const ALCcontext *Conte const ALCdevice *Device = Context->Device; const ALlistener *Listener = Context->Listener; ALuint frequency = Device->Frequency; - ALfloat lfScale, hfScale, hfRatio; + ALfloat lf0norm, hf0norm, hfRatio; ALfloat lfDecayTime, hfDecayTime; ALfloat gain, gainlf, gainhf; ALsizei i; /* Calculate the master filters */ - hfScale = props->Reverb.HFReference / frequency; + hf0norm = props->Reverb.HFReference / frequency; /* Restrict the filter gains from going below -60dB to keep the filter from * killing most of the signal. */ gainhf = maxf(props->Reverb.GainHF, 0.001f); ALfilterState_setParams(&State->Filter[0].Lp, ALfilterType_HighShelf, - gainhf, hfScale, calc_rcpQ_from_slope(gainhf, 1.0f)); - lfScale = props->Reverb.LFReference / frequency; + gainhf, hf0norm, calc_rcpQ_from_slope(gainhf, 1.0f)); + lf0norm = props->Reverb.LFReference / frequency; gainlf = maxf(props->Reverb.GainLF, 0.001f); ALfilterState_setParams(&State->Filter[0].Hp, ALfilterType_LowShelf, - gainlf, lfScale, calc_rcpQ_from_slope(gainlf, 1.0f)); + gainlf, lf0norm, calc_rcpQ_from_slope(gainlf, 1.0f)); for(i = 1;i < 4;i++) { ALfilterState_copyParams(&State->Filter[i].Lp, &State->Filter[0].Lp); @@ -1341,7 +1341,7 @@ static ALvoid ALreverbState_update(ALreverbState *State, const ALCcontext *Conte /* Update the late lines. */ UpdateLateLines(props->Reverb.Density, props->Reverb.Diffusion, lfDecayTime, props->Reverb.DecayTime, hfDecayTime, - F_TAU * lfScale, F_TAU * hfScale, + F_TAU * lf0norm, F_TAU * hf0norm, props->Reverb.EchoTime, props->Reverb.EchoDepth, frequency, State); |