aboutsummaryrefslogtreecommitdiffstats
path: root/OpenAL32
diff options
context:
space:
mode:
Diffstat (limited to 'OpenAL32')
-rw-r--r--OpenAL32/Include/alAuxEffectSlot.h2
-rw-r--r--OpenAL32/Include/alMain.h12
-rw-r--r--OpenAL32/Include/alSource.h18
-rw-r--r--OpenAL32/Include/alu.h18
-rw-r--r--OpenAL32/alAuxEffectSlot.c2
-rw-r--r--OpenAL32/alBuffer.c12
-rw-r--r--OpenAL32/alSource.c2
7 files changed, 33 insertions, 33 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 {
diff --git a/OpenAL32/alAuxEffectSlot.c b/OpenAL32/alAuxEffectSlot.c
index 08ed3d69..1823ed07 100644
--- a/OpenAL32/alAuxEffectSlot.c
+++ b/OpenAL32/alAuxEffectSlot.c
@@ -405,7 +405,7 @@ static ALvoid NoneUpdate(ALeffectState *State, ALCdevice *Device, const ALeffect
(void)Device;
(void)Slot;
}
-static ALvoid NoneProcess(ALeffectState *State, ALuint SamplesToDo, const ALfloat *SamplesIn, ALfloat (*SamplesOut)[MAXCHANNELS])
+static ALvoid NoneProcess(ALeffectState *State, ALuint SamplesToDo, const ALfloat *SamplesIn, ALfloat (*SamplesOut)[MaxChannels])
{
(void)State;
(void)SamplesToDo;
diff --git a/OpenAL32/alBuffer.c b/OpenAL32/alBuffer.c
index 3e2fcaa4..77975218 100644
--- a/OpenAL32/alBuffer.c
+++ b/OpenAL32/alBuffer.c
@@ -1088,8 +1088,8 @@ static ALalaw EncodeALaw(ALshort val)
static void DecodeIMA4Block(ALshort *dst, const ALima4 *src, ALint numchans)
{
- ALint sample[MAXCHANNELS], index[MAXCHANNELS];
- ALuint code[MAXCHANNELS];
+ ALint sample[MaxChannels], index[MaxChannels];
+ ALuint code[MaxChannels];
ALsizei j,k,c;
for(c = 0;c < numchans;c++)
@@ -1750,7 +1750,7 @@ DECL_TEMPLATE(ALubyte3, ALubyte3)
static void Convert_##T##_ALima4(T *dst, const ALima4 *src, ALuint numchans, \
ALuint len) \
{ \
- ALshort tmp[65*MAXCHANNELS]; /* Max samples an IMA4 frame can be */ \
+ ALshort tmp[65*MaxChannels]; /* Max samples an IMA4 frame can be */ \
ALuint i, j, k; \
\
i = 0; \
@@ -1786,9 +1786,9 @@ DECL_TEMPLATE(ALubyte3)
static void Convert_ALima4_##T(ALima4 *dst, const T *src, ALuint numchans, \
ALuint len) \
{ \
- ALshort tmp[65*MAXCHANNELS]; /* Max samples an IMA4 frame can be */ \
- ALint sample[MAXCHANNELS] = {0,0,0,0,0,0,0,0}; \
- ALint index[MAXCHANNELS] = {0,0,0,0,0,0,0,0}; \
+ ALshort tmp[65*MaxChannels]; /* Max samples an IMA4 frame can be */ \
+ ALint sample[MaxChannels] = {0,0,0,0,0,0,0,0}; \
+ ALint index[MaxChannels] = {0,0,0,0,0,0,0,0}; \
ALuint i, j; \
\
for(i = 0;i < len;i += 65) \
diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c
index 7d0e51d6..7b4742df 100644
--- a/OpenAL32/alSource.c
+++ b/OpenAL32/alSource.c
@@ -1667,7 +1667,7 @@ ALvoid SetSourceState(ALsource *Source, ALCcontext *Context, ALenum state)
if(Source->state != AL_PLAYING)
{
- for(j = 0;j < MAXCHANNELS;j++)
+ for(j = 0;j < MaxChannels;j++)
{
for(k = 0;k < SRC_HISTORY_LENGTH;k++)
Source->Hrtf.History[j][k] = 0.0f;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-30 21:38:41 +0000