diff options
Diffstat (limited to 'alc')
| -rw-r--r-- | alc/alu.cpp | 16 | ||||
| -rw-r--r-- | alc/effects/autowah.cpp | 2 | ||||
| -rw-r--r-- | alc/effects/reverb.cpp | 8 | ||||
| -rw-r--r-- | alc/effects/vmorpher.cpp | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/alc/alu.cpp b/alc/alu.cpp index ad5a2115..ef885152 100644 --- a/alc/alu.cpp +++ b/alc/alu.cpp @@ -1283,10 +1283,10 @@ void CalcAttnSourceParams(Voice *voice, const VoiceProps *props, const ContextBa case DistanceModel::Inverse: if(props->RefDistance > 0.0f) { - float dist{lerp(props->RefDistance, ClampedDist, props->RolloffFactor)}; + float dist{lerpf(props->RefDistance, ClampedDist, props->RolloffFactor)}; if(dist > 0.0f) DryGainBase *= props->RefDistance / dist; - dist = lerp(props->RefDistance, ClampedDist, props->RoomRolloffFactor); + dist = lerpf(props->RefDistance, ClampedDist, props->RoomRolloffFactor); if(dist > 0.0f) WetGainBase *= props->RefDistance / dist; } break; @@ -1336,19 +1336,19 @@ void CalcAttnSourceParams(Voice *voice, const VoiceProps *props, const ContextBa if(Angle >= props->OuterAngle) { ConeGain = props->OuterGain; - ConeHF = lerp(1.0f, props->OuterGainHF, props->DryGainHFAuto); + ConeHF = lerpf(1.0f, props->OuterGainHF, props->DryGainHFAuto); } else if(Angle >= props->InnerAngle) { const float scale{(Angle-props->InnerAngle) / (props->OuterAngle-props->InnerAngle)}; - ConeGain = lerp(1.0f, props->OuterGain, scale); - ConeHF = lerp(1.0f, props->OuterGainHF, scale * props->DryGainHFAuto); + ConeGain = lerpf(1.0f, props->OuterGain, scale); + ConeHF = lerpf(1.0f, props->OuterGainHF, scale * props->DryGainHFAuto); } DryGainBase *= ConeGain; - WetGainBase *= lerp(1.0f, ConeGain, props->WetGainAuto); + WetGainBase *= lerpf(1.0f, ConeGain, props->WetGainAuto); - WetConeHF = lerp(1.0f, ConeHF, props->WetGainHFAuto); + WetConeHF = lerpf(1.0f, ConeHF, props->WetGainHFAuto); } /* Apply gain and frequency filters */ @@ -1398,7 +1398,7 @@ void CalcAttnSourceParams(Voice *voice, const VoiceProps *props, const ContextBa auto calc_attenuation = [](float distance, float refdist, float rolloff) noexcept { - const float dist{lerp(refdist, distance, rolloff)}; + const float dist{lerpf(refdist, distance, rolloff)}; if(dist > refdist) return refdist / dist; return 1.0f; }; diff --git a/alc/effects/autowah.cpp b/alc/effects/autowah.cpp index 46cc8fb0..50c4a5ad 100644 --- a/alc/effects/autowah.cpp +++ b/alc/effects/autowah.cpp @@ -156,7 +156,7 @@ void AutowahState::process(const size_t samplesToDo, */ sample = peak_gain * std::fabs(samplesIn[0][i]); a = (sample > env_delay) ? attack_rate : release_rate; - env_delay = lerp(sample, env_delay, a); + env_delay = lerpf(sample, env_delay, a); /* Calculate the cos and alpha components for this sample's filter. */ w0 = minf((bandwidth*env_delay + freq_min), 0.46f) * (al::numbers::pi_v<float>*2.0f); diff --git a/alc/effects/reverb.cpp b/alc/effects/reverb.cpp index f5818c27..81c6f865 100644 --- a/alc/effects/reverb.cpp +++ b/alc/effects/reverb.cpp @@ -902,7 +902,7 @@ void LateReverb::updateLines(const float density_mult, const float diffusion, * filter for each of its four lines. Also include the average * modulation delay (depth is half the max delay in samples). */ - length += lerp(LATE_ALLPASS_LENGTHS[i], late_allpass_avg, diffusion)*density_mult + + length += lerpf(LATE_ALLPASS_LENGTHS[i], late_allpass_avg, diffusion)*density_mult + Mod.Depth[1]/frequency; /* Calculate the T60 damping coefficients for each line. */ @@ -1517,7 +1517,7 @@ void ReverbState::lateUnfaded(const size_t offset, const size_t todo) * samples that were acquired above, and combined with the main * delay tap. */ - mTempSamples[j][i] = lerp(out0, out1, frac)*midGain + + mTempSamples[j][i] = lerpf(out0, out1, frac)*midGain + main_delay.Line[late_delay_tap++][j]*densityGain; ++i; } while(--td); @@ -1586,8 +1586,8 @@ void ReverbState::lateFaded(const size_t offset, const size_t todo, const float const float fade1{densityStep*fadeCount}; const float gfade0{oldMidGain + oldMidStep*fadeCount}; const float gfade1{midStep*fadeCount}; - mTempSamples[j][i] = lerp(out00, out01, frac)*gfade0 + - lerp(out10, out11, frac)*gfade1 + + mTempSamples[j][i] = lerpf(out00, out01, frac)*gfade0 + + lerpf(out10, out11, frac)*gfade1 + main_delay.Line[late_delay_tap0++][j]*fade0 + main_delay.Line[late_delay_tap1++][j]*fade1; ++i; diff --git a/alc/effects/vmorpher.cpp b/alc/effects/vmorpher.cpp index 48cbb15e..edc50eb1 100644 --- a/alc/effects/vmorpher.cpp +++ b/alc/effects/vmorpher.cpp @@ -310,7 +310,7 @@ void VmorpherState::process(const size_t samplesToDo, const al::span<const Float alignas(16) float blended[MAX_UPDATE_SAMPLES]; for(size_t i{0u};i < td;i++) - blended[i] = lerp(mSampleBufferA[i], mSampleBufferB[i], mLfo[i]); + blended[i] = lerpf(mSampleBufferA[i], mSampleBufferB[i], mLfo[i]); /* Now, mix the processed sound data to the output. */ MixSamples({blended, td}, samplesOut, chandata->CurrentGains, chandata->TargetGains, |