From 6a9fe1e2c1c06b6bc04c3b78e2a9f69dd7a5ec6e Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Wed, 6 Apr 2022 17:41:24 -0700
Subject: Rename lerp to avoid conflicts with C++20's std::lerp
---
core/voice.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'core/voice.cpp')
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{
--
cgit v1.2.3