From 0c5cbafcd84df288c7f41e0ef06c9e3109b03365 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Wed, 19 Mar 2014 17:55:09 -0700 Subject: Use a union to combine HRTF and non-HRTF mixer params --- OpenAL32/Include/alSource.h | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'OpenAL32/Include') diff --git a/OpenAL32/Include/alSource.h b/OpenAL32/Include/alSource.h index 3fb3e553..0cc72d27 100644 --- a/OpenAL32/Include/alSource.h +++ b/OpenAL32/Include/alSource.h @@ -53,15 +53,17 @@ typedef struct DirectParams { ALfloat *ClickRemoval; ALfloat *PendingClicks; - struct { - HrtfParams Params; - HrtfState *State; - } Hrtf; - - /* A mixing matrix. First subscript is the channel number of the input data - * (regardless of channel configuration) and the second is the channel - * target (eg. FrontLeft). Not used with HRTF. */ - ALfloat Gains[MAX_INPUT_CHANNELS][MaxChannels]; + union { + struct { + HrtfParams Params; + HrtfState *State; + } Hrtf; + + /* A mixing matrix. First subscript is the channel number of the input + * data (regardless of channel configuration) and the second is the + * channel target (eg. FrontLeft). Not used with HRTF. */ + ALfloat Gains[MAX_INPUT_CHANNELS][MaxChannels]; + } Mix; ALfilterState LpFilter[MAX_INPUT_CHANNELS]; } DirectParams; -- cgit v1.2.3