diff options
| author | Chris Robinson <[email protected]> | 2014-06-13 13:34:19 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2014-06-13 13:34:19 -0700 |
| commit | a8deaf12f433281b8d996aa593ebff196e3a8189 (patch) | |
| tree | 12ee2e1548da800950f9568566781fe72ee9fbb1 /Alc/mixer_inc.c | |
| parent | c29eb6348980bf101f2a043d3f3b017dc1c48538 (diff) | |
Combine the direct and send mixers
Diffstat (limited to 'Alc/mixer_inc.c')
| -rw-r--r-- | Alc/mixer_inc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Alc/mixer_inc.c b/Alc/mixer_inc.c index 7c90ae9c..ab6f32c5 100644 --- a/Alc/mixer_inc.c +++ b/Alc/mixer_inc.c @@ -8,10 +8,10 @@ #include "align.h" -#define REAL_MERGE2(a,b) a##b -#define MERGE2(a,b) REAL_MERGE2(a,b) +#define REAL_MERGE(a,b) a##b +#define MERGE(a,b) REAL_MERGE(a,b) -#define MixDirect_Hrtf MERGE2(MixDirect_Hrtf_,SUFFIX) +#define MixHrtf MERGE(MixHrtf_,SUFFIX) static inline void ApplyCoeffsStep(ALuint Offset, ALfloat (*restrict Values)[2], @@ -25,9 +25,9 @@ static inline void ApplyCoeffs(ALuint Offset, ALfloat (*restrict Values)[2], ALfloat left, ALfloat right); -void MixDirect_Hrtf(ALfloat (*restrict OutBuffer)[BUFFERSIZE], const ALfloat *data, - ALuint Counter, ALuint Offset, ALuint OutPos, const ALuint IrSize, - const HrtfParams *hrtfparams, HrtfState *hrtfstate, ALuint BufferSize) +void MixHrtf(ALfloat (*restrict OutBuffer)[BUFFERSIZE], const ALfloat *data, + ALuint Counter, ALuint Offset, ALuint OutPos, const ALuint IrSize, + const HrtfParams *hrtfparams, HrtfState *hrtfstate, ALuint BufferSize) { alignas(16) ALfloat Coeffs[HRIR_LENGTH][2]; ALuint Delay[2]; @@ -87,7 +87,7 @@ void MixDirect_Hrtf(ALfloat (*restrict OutBuffer)[BUFFERSIZE], const ALfloat *da } -#undef MixDirect_Hrtf +#undef MixHrtf -#undef MERGE2 -#undef REAL_MERGE2 +#undef MERGE +#undef REAL_MERGE |