Store the HrtfState directly in the DirectParams

2 files changed, 3 insertions, 6 deletions

diff --git a/OpenAL32/Include/alSource.h b/OpenAL32/Include/alSource.h
index 3d3f3029..7a337a89 100644
--- a/OpenAL32/Include/alSource.h
+++ b/OpenAL32/Include/alSource.h
@@ -114,9 +114,6 @@ typedef struct ALsource {
         ALfloat GainHF;
     } Send[MAX_SENDS];
 
-    /** HRTF info. */
-    HrtfState Hrtf;
-
     /** Source needs to update its mixing parameters. */
     volatile ALenum NeedsUpdate;
 
diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h
index 6b75d96f..c4baed83 100644
--- a/OpenAL32/Include/alu.h
+++ b/OpenAL32/Include/alu.h
@@ -63,7 +63,7 @@ typedef struct DirectParams {
     union {
         struct {
             HrtfParams Params;
-            HrtfState *State;
+            HrtfState State;
         } Hrtf;
 
         /* A mixing matrix. First subscript is the channel number of the input
@@ -91,11 +91,11 @@ typedef struct SendParams {
 typedef void (*ResamplerFunc)(const ALfloat *src, ALuint frac, ALuint increment,
                               ALfloat *restrict dst, ALuint dstlen);
 
-typedef ALvoid (*DryMixerFunc)(const struct DirectParams *params,
+typedef ALvoid (*DryMixerFunc)(struct DirectParams *params,
                                const ALfloat *restrict data, ALuint srcchan,
                                ALuint OutPos, ALuint SamplesToDo,
                                ALuint BufferSize);
-typedef ALvoid (*WetMixerFunc)(const struct SendParams *params,
+typedef ALvoid (*WetMixerFunc)(struct SendParams *params,
                                const ALfloat *restrict data,
                                ALuint OutPos, ALuint SamplesToDo,
                                ALuint BufferSize);