diff options
| author | Chris Robinson <[email protected]> | 2019-10-02 16:53:23 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2019-10-02 16:53:23 -0700 |
| commit | 64e2c377d865d67efdac675c355e7b1a6b4166e6 (patch) | |
| tree | 574d85a15e26c6041da98b23d4c00ab264f481aa /alc/mixer | |
| parent | d639935e1975db4276f6ee8c3622684cefa6b269 (diff) | |
Move ALvoice from alu.h to a separate header
Diffstat (limited to 'alc/mixer')
| -rw-r--r-- | alc/mixer/defs.h | 16 | ||||
| -rw-r--r-- | alc/mixer/hrtfbase.h | 1 |
2 files changed, 13 insertions, 4 deletions
diff --git a/alc/mixer/defs.h b/alc/mixer/defs.h index ce572973..b72b2526 100644 --- a/alc/mixer/defs.h +++ b/alc/mixer/defs.h @@ -5,9 +5,11 @@ #include "alcmain.h" #include "alspan.h" -#include "alu.h" #include "hrtf.h" +union InterpState; +struct MixHrtfFilter; + enum InstSetType { CTag, @@ -39,11 +41,17 @@ void MixRow_(const al::span<float> OutBuffer, const al::span<const float> Gains, const float *InSamples, const size_t InStride); template<InstSetType InstTag> -void MixHrtf_(FloatBufferLine &LeftOut, FloatBufferLine &RightOut, const ALfloat *InSamples, float2 *AccumSamples, const size_t OutPos, const ALuint IrSize, MixHrtfFilter *hrtfparams, const size_t BufferSize); +void MixHrtf_(FloatBufferLine &LeftOut, FloatBufferLine &RightOut, const ALfloat *InSamples, + float2 *AccumSamples, const size_t OutPos, const ALuint IrSize, MixHrtfFilter *hrtfparams, + const size_t BufferSize); template<InstSetType InstTag> -void MixHrtfBlend_(FloatBufferLine &LeftOut, FloatBufferLine &RightOut, const ALfloat *InSamples, float2 *AccumSamples, const size_t OutPos, const ALuint IrSize, const HrtfFilter *oldparams, MixHrtfFilter *newparams, const size_t BufferSize); +void MixHrtfBlend_(FloatBufferLine &LeftOut, FloatBufferLine &RightOut, const ALfloat *InSamples, + float2 *AccumSamples, const size_t OutPos, const ALuint IrSize, const HrtfFilter *oldparams, + MixHrtfFilter *newparams, const size_t BufferSize); template<InstSetType InstTag> -void MixDirectHrtf_(FloatBufferLine &LeftOut, FloatBufferLine &RightOut, const al::span<const FloatBufferLine> InSamples, float2 *AccumSamples, DirectHrtfState *State, const size_t BufferSize); +void MixDirectHrtf_(FloatBufferLine &LeftOut, FloatBufferLine &RightOut, + const al::span<const FloatBufferLine> InSamples, float2 *AccumSamples, DirectHrtfState *State, + const size_t BufferSize); /* Vectorized resampler helpers */ inline void InitPosArrays(ALuint frac, ALuint increment, ALuint *frac_arr, ALuint *pos_arr, diff --git a/alc/mixer/hrtfbase.h b/alc/mixer/hrtfbase.h index d2432e90..af45a128 100644 --- a/alc/mixer/hrtfbase.h +++ b/alc/mixer/hrtfbase.h @@ -6,6 +6,7 @@ #include "alu.h" #include "../hrtf.h" #include "opthelpers.h" +#include "voice.h" using ApplyCoeffsT = void(size_t Offset, float2 *RESTRICT Values, const ALuint irSize, |