Combine some fields into a struct

1 files changed, 6 insertions, 3 deletions

diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index d2bb6985..805a6f42 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -648,9 +648,12 @@ struct ALCdevice_struct
 
     enum Channel ChannelName[MaxChannels];
 
-    enum Channel Speaker2Chan[MaxChannels];
-    ALfloat SpeakerAngle[MaxChannels];
-    ALuint  NumChan;
+    /* This only counts positional speakers, i.e. not including LFE. */
+    struct {
+        enum Channel ChanName;
+        ALfloat Angle;
+    } Speaker[MaxChannels];
+    ALuint NumSpeakers;
 
     ALuint64 ClockBase;
     ALuint SamplesDone;