diff options
Diffstat (limited to 'alc/mixer/defs.h')
-rw-r--r-- | alc/mixer/defs.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/alc/mixer/defs.h b/alc/mixer/defs.h index 762355d2..bb59b867 100644 --- a/alc/mixer/defs.h +++ b/alc/mixer/defs.h @@ -1,8 +1,6 @@ #ifndef MIXER_DEFS_H #define MIXER_DEFS_H -#include "AL/al.h" - #include "alcmain.h" #include "alspan.h" #include "alu.h" @@ -11,20 +9,22 @@ union InterpState; struct MixHrtfFilter; +using uint = unsigned int; + template<typename TypeTag, typename InstTag> -const float *Resample_(const InterpState *state, const float *RESTRICT src, ALuint frac, - ALuint increment, const al::span<float> dst); +const float *Resample_(const InterpState *state, const float *RESTRICT src, uint frac, + uint increment, const al::span<float> dst); template<typename InstTag> void Mix_(const al::span<const float> InSamples, const al::span<FloatBufferLine> OutBuffer, float *CurrentGains, const float *TargetGains, const size_t Counter, const size_t OutPos); template<typename InstTag> -void MixHrtf_(const float *InSamples, float2 *AccumSamples, const ALuint IrSize, +void MixHrtf_(const float *InSamples, float2 *AccumSamples, const uint IrSize, const MixHrtfFilter *hrtfparams, const size_t BufferSize); template<typename InstTag> -void MixHrtfBlend_(const float *InSamples, float2 *AccumSamples, const ALuint IrSize, +void MixHrtfBlend_(const float *InSamples, float2 *AccumSamples, const uint IrSize, const HrtfFilter *oldparams, const MixHrtfFilter *newparams, const size_t BufferSize); template<typename InstTag> void MixDirectHrtf_(FloatBufferLine &LeftOut, FloatBufferLine &RightOut, @@ -32,14 +32,13 @@ void MixDirectHrtf_(FloatBufferLine &LeftOut, FloatBufferLine &RightOut, const size_t BufferSize); /* Vectorized resampler helpers */ -inline void InitPosArrays(ALuint frac, ALuint increment, ALuint *frac_arr, ALuint *pos_arr, - size_t size) +inline void InitPosArrays(uint frac, uint increment, uint *frac_arr, uint *pos_arr, size_t size) { pos_arr[0] = 0; frac_arr[0] = frac; for(size_t i{1};i < size;i++) { - const ALuint frac_tmp{frac_arr[i-1] + increment}; + const uint frac_tmp{frac_arr[i-1] + increment}; pos_arr[i] = pos_arr[i-1] + (frac_tmp>>MixerFracBits); frac_arr[i] = frac_tmp&MixerFracMask; } |