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 /OpenAL32 | |
| parent | c29eb6348980bf101f2a043d3f3b017dc1c48538 (diff) | |
Combine the direct and send mixers
Diffstat (limited to 'OpenAL32')
| -rw-r--r-- | OpenAL32/Include/alSource.h | 7 | ||||
| -rw-r--r-- | OpenAL32/Include/alu.h | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/OpenAL32/Include/alSource.h b/OpenAL32/Include/alSource.h index fa73683c..f75a670b 100644 --- a/OpenAL32/Include/alSource.h +++ b/OpenAL32/Include/alSource.h @@ -32,11 +32,8 @@ typedef struct ALactivesource { /** Current target parameters used for mixing. */ ResamplerFunc Resample; - union { - MixerFunc Mix; - HrtfMixerFunc HrtfMix; - } Dry; - MixerFunc WetMix; + MixerFunc Mix; + HrtfMixerFunc HrtfMix; ALboolean IsHrtf; ALint Step; diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h index 7a6ddf08..7727c666 100644 --- a/OpenAL32/Include/alu.h +++ b/OpenAL32/Include/alu.h @@ -117,9 +117,9 @@ typedef struct SendParams { typedef const ALfloat* (*ResamplerFunc)(const ALfloat *src, ALuint frac, ALuint increment, ALfloat *restrict dst, ALuint dstlen); -typedef void (*MixerFunc)(ALfloat (*restrict OutBuffer)[BUFFERSIZE], const ALfloat *data, - MixGains *Gains, ALuint Counter, ALuint OutPos, - ALuint BufferSize); +typedef void (*MixerFunc)(const ALfloat *data, ALuint OutChans, + ALfloat (*restrict OutBuffer)[BUFFERSIZE], struct MixGains *Gains, + ALuint Counter, ALuint OutPos, ALuint BufferSize); typedef void (*HrtfMixerFunc)(ALfloat (*restrict OutBuffer)[BUFFERSIZE], const ALfloat *data, ALuint Counter, ALuint Offset, ALuint OutPos, const ALuint IrSize, const HrtfParams *hrtfparams, |