Split aluInitPanning into separate functions for HRTF or UHJ

2 files changed, 7 insertions, 3 deletions

diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index 60dc9fb1..909c42cd 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -472,6 +472,8 @@ struct ALCdevice_struct
     al_string Hrtf_Name;
     const struct Hrtf *Hrtf;
     ALCenum Hrtf_Status;
+
+    /* HRTF filter state for dry buffer content */
     HrtfState Hrtf_State[MAX_OUTPUT_CHANNELS];
     HrtfParams Hrtf_Params[MAX_OUTPUT_CHANNELS];
     ALuint Hrtf_Offset;
@@ -479,12 +481,12 @@ struct ALCdevice_struct
     /* UHJ encoder state */
     struct Uhj2Encoder *Uhj_Encoder;
 
-    // Stereo-to-binaural filter
-    struct bs2b *Bs2b;
-
     /* High quality Ambisonic decoder */
     struct BFormatDec *AmbiDecoder;
 
+    // Stereo-to-binaural filter
+    struct bs2b *Bs2b;
+
     /* Rendering mode. */
     enum RenderMode Render_Mode;
 
diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h
index 08f25204..a70daa46 100644
--- a/OpenAL32/Include/alu.h
+++ b/OpenAL32/Include/alu.h
@@ -281,6 +281,8 @@ inline ALfloat resample_fir8(ALfloat val0, ALfloat val1, ALfloat val2, ALfloat v
 void aluInitMixer(void);
 
 ALvoid aluInitPanning(ALCdevice *Device);
+ALvoid aluInitHrtfPanning(ALCdevice *device);
+ALvoid aluInitUhjPanning(ALCdevice *device);
 
 void aluInitEffectPanning(struct ALeffectslot *slot);