From 9e8fb89a525c11685869d963c39e4f1076835d85 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Wed, 1 Dec 2010 18:33:17 -0800
Subject: Rename OUTPUTCHANNELS to something more descriptive

---
 OpenAL32/Include/alAuxEffectSlot.h |  2 +-
 OpenAL32/Include/alMain.h          | 14 +++++++-------
 OpenAL32/Include/alSource.h        |  6 +++---
 OpenAL32/Include/alu.h             |  2 +-
 OpenAL32/alAuxEffectSlot.c         |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'OpenAL32')

diff --git a/OpenAL32/Include/alAuxEffectSlot.h b/OpenAL32/Include/alAuxEffectSlot.h
index 92165d62..43d2f719 100644
--- a/OpenAL32/Include/alAuxEffectSlot.h
+++ b/OpenAL32/Include/alAuxEffectSlot.h
@@ -41,7 +41,7 @@ struct ALeffectState {
     ALvoid (*Destroy)(ALeffectState *State);
     ALboolean (*DeviceUpdate)(ALeffectState *State, ALCdevice *Device);
     ALvoid (*Update)(ALeffectState *State, ALCcontext *Context, const ALeffect *Effect);
-    ALvoid (*Process)(ALeffectState *State, const ALeffectslot *Slot, ALuint SamplesToDo, const ALfloat *SamplesIn, ALfloat (*SamplesOut)[OUTPUTCHANNELS]);
+    ALvoid (*Process)(ALeffectState *State, const ALeffectslot *Slot, ALuint SamplesToDo, const ALfloat *SamplesIn, ALfloat (*SamplesOut)[MAXCHANNELS]);
 };
 
 ALeffectState *NoneCreate(void);
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index 1bfcc0f1..135ce31a 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -373,18 +373,18 @@ struct ALCdevice_struct
     ALboolean    DuplicateStereo;
 
     // Dry path buffer mix
-    ALfloat DryBuffer[BUFFERSIZE][OUTPUTCHANNELS];
+    ALfloat DryBuffer[BUFFERSIZE][MAXCHANNELS];
 
-    ALuint DevChannels[OUTPUTCHANNELS];
+    ALuint DevChannels[MAXCHANNELS];
 
-    ALfloat ChannelMatrix[OUTPUTCHANNELS][OUTPUTCHANNELS];
+    ALfloat ChannelMatrix[MAXCHANNELS][MAXCHANNELS];
 
-    Channel Speaker2Chan[OUTPUTCHANNELS];
-    ALfloat PanningLUT[OUTPUTCHANNELS * LUT_NUM];
+    Channel Speaker2Chan[MAXCHANNELS];
+    ALfloat PanningLUT[MAXCHANNELS * LUT_NUM];
     ALuint  NumChan;
 
-    ALfloat ClickRemoval[OUTPUTCHANNELS];
-    ALfloat PendingClicks[OUTPUTCHANNELS];
+    ALfloat ClickRemoval[MAXCHANNELS];
+    ALfloat PendingClicks[MAXCHANNELS];
 
     // Contexts created on this device
     ALCcontext  **Contexts;
diff --git a/OpenAL32/Include/alSource.h b/OpenAL32/Include/alSource.h
index 154c9cfe..09ff330b 100644
--- a/OpenAL32/Include/alSource.h
+++ b/OpenAL32/Include/alSource.h
@@ -91,14 +91,14 @@ typedef struct ALsource
     struct {
         ALint Step;
 
-        ALfloat DryGains[OUTPUTCHANNELS];
+        ALfloat DryGains[MAXCHANNELS];
         FILTER iirFilter;
-        ALfloat history[OUTPUTCHANNELS*2];
+        ALfloat history[MAXCHANNELS*2];
 
         struct {
             ALfloat WetGain;
             FILTER iirFilter;
-            ALfloat history[OUTPUTCHANNELS];
+            ALfloat history[MAXCHANNELS];
         } Send[MAX_SENDS];
     } Params;
 
diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h
index 7f1cad0f..a0c0e4b3 100644
--- a/OpenAL32/Include/alu.h
+++ b/OpenAL32/Include/alu.h
@@ -72,7 +72,7 @@ typedef enum {
     SIDE_LEFT,
     SIDE_RIGHT,
 
-    OUTPUTCHANNELS
+    MAXCHANNELS
 } Channel;
 
 #define BUFFERSIZE 4096
diff --git a/OpenAL32/alAuxEffectSlot.c b/OpenAL32/alAuxEffectSlot.c
index 520b8ea7..aab4f96b 100644
--- a/OpenAL32/alAuxEffectSlot.c
+++ b/OpenAL32/alAuxEffectSlot.c
@@ -449,7 +449,7 @@ static ALvoid NoneUpdate(ALeffectState *State, ALCcontext *Context, const ALeffe
     (void)Context;
     (void)Effect;
 }
-static ALvoid NoneProcess(ALeffectState *State, const ALeffectslot *Slot, ALuint SamplesToDo, const ALfloat *SamplesIn, ALfloat (*SamplesOut)[OUTPUTCHANNELS])
+static ALvoid NoneProcess(ALeffectState *State, const ALeffectslot *Slot, ALuint SamplesToDo, const ALfloat *SamplesIn, ALfloat (*SamplesOut)[MAXCHANNELS])
 {
     (void)State;
     (void)Slot;
-- 
cgit v1.2.3