diff options
| author | Chris Robinson <[email protected]> | 2022-04-06 17:41:24 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2022-04-06 17:41:24 -0700 |
| commit | 6a9fe1e2c1c06b6bc04c3b78e2a9f69dd7a5ec6e (patch) | |
| tree | a6ffd2560ab4e6b632b2db5f8e6db6de7823d7dd /core/voice.cpp | |
| parent | 707f4cca27e096c167e79619642fbe2e872ee4c8 (diff) | |
Rename lerp to avoid conflicts with C++20's std::lerp
Diffstat (limited to 'core/voice.cpp')
| -rw-r--r-- | core/voice.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/voice.cpp b/core/voice.cpp index 0060737f..e269c4a9 100644 --- a/core/voice.cpp +++ b/core/voice.cpp @@ -382,7 +382,7 @@ void DoHrtfMix(const float *samples, const uint DstBufferSize, DirectParams &par if(Counter > fademix) { const float a{static_cast<float>(fademix) / static_cast<float>(Counter)}; - gain = lerp(parms.Hrtf.Old.Gain, TargetGain, a); + gain = lerpf(parms.Hrtf.Old.Gain, TargetGain, a); } MixHrtfFilter hrtfparams{ @@ -409,7 +409,7 @@ void DoHrtfMix(const float *samples, const uint DstBufferSize, DirectParams &par if(Counter > DstBufferSize) { const float a{static_cast<float>(todo) / static_cast<float>(Counter-fademix)}; - gain = lerp(parms.Hrtf.Old.Gain, TargetGain, a); + gain = lerpf(parms.Hrtf.Old.Gain, TargetGain, a); } MixHrtfFilter hrtfparams{ |