4 files changed, 25 insertions, 25 deletions
diff --git a/OpenAL32/Include/alAuxEffectSlot.h b/OpenAL32/Include/alAuxEffectSlot.h
index 70bb8317..dd8d3d76 100644
--- a/OpenAL32/Include/alAuxEffectSlot.h
+++ b/OpenAL32/Include/alAuxEffectSlot.h
@@ -40,7 +40,7 @@ struct ALeffectState {
     ALvoid (*Destroy)(ALeffectState *State);
     ALboolean (*DeviceUpdate)(ALeffectState *State, ALCdevice *Device);
     ALvoid (*Update)(ALeffectState *State, ALCdevice *Device, const ALeffectslot *Slot);
-    ALvoid (*Process)(ALeffectState *State, ALuint SamplesToDo, const ALfloat *SamplesIn, ALfloat (*SamplesOut)[MAXCHANNELS]);
+    ALvoid (*Process)(ALeffectState *State, ALuint SamplesToDo, const ALfloat *SamplesIn, ALfloat (*SamplesOut)[MaxChannels]);
 };
 
 ALeffectState *NoneCreate(void);
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index 96943ccb..420c187d 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -570,16 +570,16 @@ struct ALCdevice_struct
     ALuint       Flags;
 
     // Dry path buffer mix
-    ALfloat DryBuffer[BUFFERSIZE][MAXCHANNELS];
+    ALfloat DryBuffer[BUFFERSIZE][MaxChannels];
 
-    enum Channel DevChannels[MAXCHANNELS];
+    enum Channel DevChannels[MaxChannels];
 
-    enum Channel Speaker2Chan[MAXCHANNELS];
-    ALfloat SpeakerAngle[MAXCHANNELS];
+    enum Channel Speaker2Chan[MaxChannels];
+    ALfloat SpeakerAngle[MaxChannels];
     ALuint  NumChan;
 
-    ALfloat ClickRemoval[MAXCHANNELS];
-    ALfloat PendingClicks[MAXCHANNELS];
+    ALfloat ClickRemoval[MaxChannels];
+    ALfloat PendingClicks[MaxChannels];
 
     /* Default effect slot */
     struct ALeffectslot *DefaultSlot;
diff --git a/OpenAL32/Include/alSource.h b/OpenAL32/Include/alSource.h
index f76f618d..6a85567e 100644
--- a/OpenAL32/Include/alSource.h
+++ b/OpenAL32/Include/alSource.h
@@ -31,17 +31,17 @@ typedef struct ALbufferlistitem
 typedef struct HrtfState {
     ALboolean Moving;
     ALuint Counter;
-    ALfloat History[MAXCHANNELS][SRC_HISTORY_LENGTH];
-    ALfloat Values[MAXCHANNELS][HRIR_LENGTH][2];
+    ALfloat History[MaxChannels][SRC_HISTORY_LENGTH];
+    ALfloat Values[MaxChannels][HRIR_LENGTH][2];
     ALuint Offset;
 } HrtfState;
 
 typedef struct HrtfParams {
     ALfloat Gain;
     ALfloat Dir[3];
-    ALfloat Coeffs[MAXCHANNELS][HRIR_LENGTH][2];
-    ALuint Delay[MAXCHANNELS][2];
-    ALfloat CoeffStep[HRIR_LENGTH][2];
+    ALfloat Coeffs[MaxChannels][HRIR_LENGTH][2];
+    ALuint Delay[MaxChannels][2];
+    ALfloat CoeffStep[MaxChannels][2];
     ALint DelayStep[2];
 } HrtfParams;
 
@@ -50,12 +50,12 @@ typedef struct DirectParams {
 
     /* 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. FRONT_LEFT). Not used with HRTF. */
-    ALfloat Gains[MAXCHANNELS][MAXCHANNELS];
+     * target (eg. FrontLeft). Not used with HRTF. */
+    ALfloat Gains[MaxChannels][MaxChannels];
 
     /* A low-pass filter, using 2 chained one-pole filters. */
     FILTER iirFilter;
-    ALfloat history[MAXCHANNELS*2];
+    ALfloat history[MaxChannels*2];
 } DirectParams;
 
 typedef struct SendParams {
@@ -65,7 +65,7 @@ typedef struct SendParams {
 
     /* A low-pass filter, using 2 chained one-pole filters. */
     FILTER iirFilter;
-    ALfloat history[MAXCHANNELS*2];
+    ALfloat history[MaxChannels*2];
 } SendParams;
 
 
diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h
index 9efee100..289614de 100644
--- a/OpenAL32/Include/alu.h
+++ b/OpenAL32/Include/alu.h
@@ -139,17 +139,17 @@ enum Resampler {
 };
 
 enum Channel {
-    FRONT_LEFT = 0,
-    FRONT_RIGHT,
-    FRONT_CENTER,
+    FrontLeft = 0,
+    FrontRight,
+    FrontCenter,
     LFE,
-    BACK_LEFT,
-    BACK_RIGHT,
-    BACK_CENTER,
-    SIDE_LEFT,
-    SIDE_RIGHT,
+    BackLeft,
+    BackRight,
+    BackCenter,
+    SideLeft,
+    SideRight,
 
-    MAXCHANNELS
+    MaxChannels
 };
 
 enum DistanceModel {