Use a separate macro for the max output channel count

10 files changed, 25 insertions, 25 deletions

diff --git a/Alc/effects/autowah.c b/Alc/effects/autowah.c
index e4edb2d4..8caf1fcc 100644
--- a/Alc/effects/autowah.c
+++ b/Alc/effects/autowah.c
@@ -39,7 +39,7 @@ typedef struct ALautowahState {
     DERIVE_FROM_TYPE(ALeffectState);
 
     /* Effect gains for each channel */
-    ALfloat Gain[MaxChannels];
+    ALfloat Gain[MAX_OUTPUT_CHANNELS];
 
     /* Effect parameters */
     ALfloat AttackRate;
@@ -135,7 +135,7 @@ static ALvoid ALautowahState_process(ALautowahState *state, ALuint SamplesToDo,
         }
         state->GainCtrl = gain;
 
-        for(kt = 0;kt < MaxChannels;kt++)
+        for(kt = 0;kt < MAX_OUTPUT_CHANNELS;kt++)
         {
             ALfloat gain = state->Gain[kt];
             if(!(gain > GAIN_SILENCE_THRESHOLD))
diff --git a/Alc/effects/chorus.c b/Alc/effects/chorus.c
index 6e541208..0dde134a 100644
--- a/Alc/effects/chorus.c
+++ b/Alc/effects/chorus.c
@@ -46,7 +46,7 @@ typedef struct ALchorusState {
     ALint lfo_disp;
 
     /* Gains for left and right sides */
-    ALfloat Gain[2][MaxChannels];
+    ALfloat Gain[2][MAX_OUTPUT_CHANNELS];
 
     /* effect parameters */
     enum ChorusWaveForm waveform;
@@ -223,7 +223,7 @@ static ALvoid ALchorusState_process(ALchorusState *state, ALuint SamplesToDo, co
                 break;
         }
 
-        for(kt = 0;kt < MaxChannels;kt++)
+        for(kt = 0;kt < MAX_OUTPUT_CHANNELS;kt++)
         {
             ALfloat gain = state->Gain[0][kt];
             if(gain > GAIN_SILENCE_THRESHOLD)
diff --git a/Alc/effects/compressor.c b/Alc/effects/compressor.c
index bc1cb81a..ab88ecf0 100644
--- a/Alc/effects/compressor.c
+++ b/Alc/effects/compressor.c
@@ -31,7 +31,7 @@ typedef struct ALcompressorState {
     DERIVE_FROM_TYPE(ALeffectState);
 
     /* Effect gains for each channel */
-    ALfloat Gain[MaxChannels];
+    ALfloat Gain[MAX_OUTPUT_CHANNELS];
 
     /* Effect parameters */
     ALboolean Enabled;
@@ -116,7 +116,7 @@ static ALvoid ALcompressorState_process(ALcompressorState *state, ALuint Samples
         }
 
 
-        for(kt = 0;kt < MaxChannels;kt++)
+        for(kt = 0;kt < MAX_OUTPUT_CHANNELS;kt++)
         {
             ALfloat gain = state->Gain[kt];
             if(!(gain > GAIN_SILENCE_THRESHOLD))
diff --git a/Alc/effects/dedicated.c b/Alc/effects/dedicated.c
index 755ed611..2d955888 100644
--- a/Alc/effects/dedicated.c
+++ b/Alc/effects/dedicated.c
@@ -32,7 +32,7 @@
 typedef struct ALdedicatedState {
     DERIVE_FROM_TYPE(ALeffectState);
 
-    ALfloat gains[MaxChannels];
+    ALfloat gains[MAX_OUTPUT_CHANNELS];
 } ALdedicatedState;
 
 
@@ -50,7 +50,7 @@ static ALvoid ALdedicatedState_update(ALdedicatedState *state, ALCdevice *device
     ALfloat Gain;
     ALuint i;
 
-    for(i = 0;i < MaxChannels;i++)
+    for(i = 0;i < MAX_OUTPUT_CHANNELS;i++)
         state->gains[i] = 0.0f;
 
     Gain = Slot->Gain * Slot->EffectProps.Dedicated.Gain;
@@ -80,7 +80,7 @@ static ALvoid ALdedicatedState_process(ALdedicatedState *state, ALuint SamplesTo
     const ALfloat *gains = state->gains;
     ALuint i, c;
 
-    for(c = 0;c < MaxChannels;c++)
+    for(c = 0;c < MAX_OUTPUT_CHANNELS;c++)
     {
         if(!(gains[c] > GAIN_SILENCE_THRESHOLD))
             continue;
@@ -108,7 +108,7 @@ ALeffectState *ALdedicatedStateFactory_create(ALdedicatedStateFactory *UNUSED(fa
     if(!state) return NULL;
     SET_VTABLE2(ALdedicatedState, ALeffectState, state);
 
-    for(s = 0;s < MaxChannels;s++)
+    for(s = 0;s < MAX_OUTPUT_CHANNELS;s++)
         state->gains[s] = 0.0f;
 
     return STATIC_CAST(ALeffectState, state);
diff --git a/Alc/effects/distortion.c b/Alc/effects/distortion.c
index 95e76ac1..9474f3ae 100644
--- a/Alc/effects/distortion.c
+++ b/Alc/effects/distortion.c
@@ -34,7 +34,7 @@ typedef struct ALdistortionState {
     DERIVE_FROM_TYPE(ALeffectState);
 
     /* Effect gains for each channel */
-    ALfloat Gain[MaxChannels];
+    ALfloat Gain[MAX_OUTPUT_CHANNELS];
 
     /* Effect parameters */
     ALfilterState lowpass;
@@ -154,7 +154,7 @@ static ALvoid ALdistortionState_process(ALdistortionState *state, ALuint Samples
             temps[it] = oversample_buffer[it][0] * state->attenuation;
         }
 
-        for(kt = 0;kt < MaxChannels;kt++)
+        for(kt = 0;kt < MAX_OUTPUT_CHANNELS;kt++)
         {
             ALfloat gain = state->Gain[kt];
             if(!(gain > GAIN_SILENCE_THRESHOLD))
diff --git a/Alc/effects/echo.c b/Alc/effects/echo.c
index 69d9b84f..d6c62a30 100644
--- a/Alc/effects/echo.c
+++ b/Alc/effects/echo.c
@@ -43,7 +43,7 @@ typedef struct ALechoState {
     } Tap[2];
     ALuint Offset;
     /* The panning gains for the two taps */
-    ALfloat Gain[2][MaxChannels];
+    ALfloat Gain[2][MAX_OUTPUT_CHANNELS];
 
     ALfloat FeedGain;
 
@@ -138,7 +138,7 @@ static ALvoid ALechoState_process(ALechoState *state, ALuint SamplesToDo, const
             offset++;
         }
 
-        for(k = 0;k < MaxChannels;k++)
+        for(k = 0;k < MAX_OUTPUT_CHANNELS;k++)
         {
             ALfloat gain = state->Gain[0][k];
             if(gain > GAIN_SILENCE_THRESHOLD)
diff --git a/Alc/effects/equalizer.c b/Alc/effects/equalizer.c
index f555cbe5..dc02e9b0 100644
--- a/Alc/effects/equalizer.c
+++ b/Alc/effects/equalizer.c
@@ -75,7 +75,7 @@ typedef struct ALequalizerState {
     DERIVE_FROM_TYPE(ALeffectState);
 
     /* Effect gains for each channel */
-    ALfloat Gain[MaxChannels];
+    ALfloat Gain[MAX_OUTPUT_CHANNELS];
 
     /* Effect parameters */
     ALfilterState filter[4];
@@ -140,7 +140,7 @@ static ALvoid ALequalizerState_process(ALequalizerState *state, ALuint SamplesTo
             temps[it] = smp;
         }
 
-        for(kt = 0;kt < MaxChannels;kt++)
+        for(kt = 0;kt < MAX_OUTPUT_CHANNELS;kt++)
         {
             ALfloat gain = state->Gain[kt];
             if(!(gain > GAIN_SILENCE_THRESHOLD))
diff --git a/Alc/effects/flanger.c b/Alc/effects/flanger.c
index a38b3b13..e5a49a43 100644
--- a/Alc/effects/flanger.c
+++ b/Alc/effects/flanger.c
@@ -46,7 +46,7 @@ typedef struct ALflangerState {
     ALint lfo_disp;
 
     /* Gains for left and right sides */
-    ALfloat Gain[2][MaxChannels];
+    ALfloat Gain[2][MAX_OUTPUT_CHANNELS];
 
     /* effect parameters */
     enum FlangerWaveForm waveform;
@@ -223,7 +223,7 @@ static ALvoid ALflangerState_process(ALflangerState *state, ALuint SamplesToDo,
                 break;
         }
 
-        for(kt = 0;kt < MaxChannels;kt++)
+        for(kt = 0;kt < MAX_OUTPUT_CHANNELS;kt++)
         {
             ALfloat gain = state->Gain[0][kt];
             if(gain > GAIN_SILENCE_THRESHOLD)
diff --git a/Alc/effects/modulator.c b/Alc/effects/modulator.c
index 01d19bcb..c69a8a09 100644
--- a/Alc/effects/modulator.c
+++ b/Alc/effects/modulator.c
@@ -42,7 +42,7 @@ typedef struct ALmodulatorState {
     ALuint index;
     ALuint step;
 
-    ALfloat Gain[MaxChannels];
+    ALfloat Gain[MAX_OUTPUT_CHANNELS];
 
     ALfilterState Filter;
 } ALmodulatorState;
@@ -92,7 +92,7 @@ static void Process##func(ALmodulatorState *state, ALuint SamplesToDo,        \
             temps[i] = samp * func(index);                                    \
         }                                                                     \
                                                                               \
-        for(k = 0;k < MaxChannels;k++)                                        \
+        for(k = 0;k < MAX_OUTPUT_CHANNELS;k++)                                \
         {                                                                     \
             ALfloat gain = state->Gain[k];                                    \
             if(!(gain > GAIN_SILENCE_THRESHOLD))                              \
diff --git a/Alc/effects/reverb.c b/Alc/effects/reverb.c
index 5b937d96..e1b47ec2 100644
--- a/Alc/effects/reverb.c
+++ b/Alc/effects/reverb.c
@@ -86,7 +86,7 @@ typedef struct ALreverbState {
 
         // The gain for each output channel based on 3D panning (only for the
         // EAX path).
-        ALfloat   PanGain[MaxChannels];
+        ALfloat   PanGain[MAX_OUTPUT_CHANNELS];
     } Early;
 
     // Decorrelator delay line.
@@ -125,7 +125,7 @@ typedef struct ALreverbState {
 
         // The gain for each output channel based on 3D panning (only for the
         // EAX path).
-        ALfloat   PanGain[MaxChannels];
+        ALfloat   PanGain[MAX_OUTPUT_CHANNELS];
     } Late;
 
     struct {
@@ -565,7 +565,7 @@ static ALvoid ALreverbState_processStandard(ALreverbState *State, ALuint Samples
     for(index = 0;index < SamplesToDo;index++)
         VerbPass(State, SamplesIn[index], out[index]);
 
-    for(c = 0;c < MaxChannels;c++)
+    for(c = 0;c < MAX_OUTPUT_CHANNELS;c++)
     {
         ALfloat gain = State->Gain[c];
         if(!(gain > GAIN_SILENCE_THRESHOLD))
@@ -586,7 +586,7 @@ static ALvoid ALreverbState_processEax(ALreverbState *State, ALuint SamplesToDo,
     for(index = 0;index < SamplesToDo;index++)
         EAXVerbPass(State, SamplesIn[index], early[index], late[index]);
 
-    for(c = 0;c < MaxChannels;c++)
+    for(c = 0;c < MAX_OUTPUT_CHANNELS;c++)
     {
         ALfloat earlyGain, lateGain;
 
@@ -1231,7 +1231,7 @@ static ALeffectState *ALreverbStateFactory_create(ALreverbStateFactory* UNUSED(f
         state->Late.LpSample[index] = 0.0f;
     }
 
-    for(index = 0;index < MaxChannels;index++)
+    for(index = 0;index < MAX_OUTPUT_CHANNELS;index++)
     {
         state->Early.PanGain[index] = 0.0f;
         state->Late.PanGain[index] = 0.0f;