From 80710c146a69823cef9827415c04f9f5491dc38c Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Tue, 20 Aug 2019 12:00:24 -0700 Subject: Use size_t for the mixers' fade counter and outpos --- alc/mixer/mixer_c.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'alc/mixer/mixer_c.cpp') diff --git a/alc/mixer/mixer_c.cpp b/alc/mixer/mixer_c.cpp index 4af88fec..dbdbf16d 100644 --- a/alc/mixer/mixer_c.cpp +++ b/alc/mixer/mixer_c.cpp @@ -114,7 +114,7 @@ static inline void ApplyCoeffs(size_t /*Offset*/, float2 *RESTRICT Values, const template<> void MixHrtf_(FloatBufferLine &LeftOut, FloatBufferLine &RightOut, - const ALfloat *InSamples, float2 *AccumSamples, const ALsizei OutPos, const ALsizei IrSize, + const ALfloat *InSamples, float2 *AccumSamples, const size_t OutPos, const ALsizei IrSize, MixHrtfFilter *hrtfparams, const size_t BufferSize) { MixHrtfBase(LeftOut, RightOut, InSamples, AccumSamples, OutPos, IrSize, @@ -123,7 +123,7 @@ void MixHrtf_(FloatBufferLine &LeftOut, FloatBufferLine &RightOut, template<> void MixHrtfBlend_(FloatBufferLine &LeftOut, FloatBufferLine &RightOut, - const ALfloat *InSamples, float2 *AccumSamples, const ALsizei OutPos, const ALsizei IrSize, + const ALfloat *InSamples, float2 *AccumSamples, const size_t OutPos, const ALsizei IrSize, const HrtfFilter *oldparams, MixHrtfFilter *newparams, const size_t BufferSize) { MixHrtfBlendBase(LeftOut, RightOut, InSamples, AccumSamples, OutPos, IrSize, @@ -141,10 +141,10 @@ void MixDirectHrtf_(FloatBufferLine &LeftOut, FloatBufferLine &RightOut, template<> void Mix_(const al::span InSamples, const al::span OutBuffer, - float *CurrentGains, const float *TargetGains, const ALsizei Counter, const ALsizei OutPos) + float *CurrentGains, const float *TargetGains, const size_t Counter, const size_t OutPos) { const ALfloat delta{(Counter > 0) ? 1.0f / static_cast(Counter) : 0.0f}; - const bool reached_target{InSamples.size() >= static_cast(Counter)}; + const bool reached_target{InSamples.size() >= Counter}; const auto min_end = reached_target ? InSamples.begin() + Counter : InSamples.end(); for(FloatBufferLine &output : OutBuffer) { -- cgit v1.2.3