aboutsummaryrefslogtreecommitdiffstats
path: root/alc/mixer/mixer_c.cpp
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2019-10-02 22:38:19 -0700
committerChris Robinson <[email protected]>2019-10-02 22:38:19 -0700
commitb350ae3766f0f85183c410b4c77ac9a0eb388511 (patch)
tree49b70ba082ac4daba2b8404638386b07d3d87354 /alc/mixer/mixer_c.cpp
parentbce6889173245031cf1440d70858180cc2716adf (diff)
Remove the Offset parameter from ApplyCoeffs
Diffstat (limited to 'alc/mixer/mixer_c.cpp')
-rw-r--r--alc/mixer/mixer_c.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/alc/mixer/mixer_c.cpp b/alc/mixer/mixer_c.cpp
index 8aa32e6b..ffc07acd 100644
--- a/alc/mixer/mixer_c.cpp
+++ b/alc/mixer/mixer_c.cpp
@@ -68,7 +68,7 @@ const float *DoResample(const InterpState *state, const float *RESTRICT src, ALu
ALuint increment, const al::span<float> dst)
{
const InterpState istate{*state};
- auto proc_sample = [&src,&frac,istate,increment]() -> ALfloat
+ auto proc_sample = [&src,&frac,istate,increment]() -> float
{
const float ret{Sampler(istate, src, frac)};
@@ -83,6 +83,17 @@ const float *DoResample(const InterpState *state, const float *RESTRICT src, ALu
return dst.begin();
}
+inline void ApplyCoeffs(float2 *RESTRICT Values, const ALuint IrSize, const HrirArray &Coeffs,
+ const float left, const float right)
+{
+ ASSUME(IrSize >= 4);
+ for(ALuint c{0};c < IrSize;++c)
+ {
+ Values[c][0] += Coeffs[c][0] * left;
+ Values[c][1] += Coeffs[c][1] * right;
+ }
+}
+
} // namespace
template<>
@@ -124,17 +135,6 @@ const ALfloat *Resample_<FastBSincTag,CTag>(const InterpState *state, const ALfl
{ return DoResample<do_fastbsinc>(state, src-state->bsinc.l, frac, increment, dst); }
-static inline void ApplyCoeffs(size_t /*Offset*/, float2 *RESTRICT Values, const ALuint IrSize,
- const HrirArray &Coeffs, const float left, const float right)
-{
- ASSUME(IrSize >= 4);
- for(ALuint c{0};c < IrSize;++c)
- {
- Values[c][0] += Coeffs[c][0] * left;
- Values[c][1] += Coeffs[c][1] * right;
- }
-}
-
template<>
void MixHrtf_<CTag>(FloatBufferLine &LeftOut, FloatBufferLine &RightOut,
const float *InSamples, float2 *AccumSamples, const size_t OutPos, const ALuint IrSize,