aboutsummaryrefslogtreecommitdiffstats
path: root/Alc/ALc.c
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2012-06-28 18:49:49 -0700
committerChris Robinson <[email protected]>2012-06-28 18:49:49 -0700
commit583dc8dbcaf8ce59678fe287b1e584c2f99b7f3c (patch)
treef71172e7731bb6711e6a4768196f76aec02e6635 /Alc/ALc.c
parentbefa4e7528f5ca1f54481bf137706de0239e98eb (diff)
Don't use all caps for enum value names
Diffstat (limited to 'Alc/ALc.c')
-rw-r--r--Alc/ALc.c86
1 files changed, 43 insertions, 43 deletions
diff --git a/Alc/ALc.c b/Alc/ALc.c
index 8c4f0d81..0807dae9 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -1225,46 +1225,46 @@ void SetDefaultWFXChannelOrder(ALCdevice *device)
{
switch(device->FmtChans)
{
- case DevFmtMono: device->DevChannels[0] = FRONT_CENTER; break;
+ case DevFmtMono: device->DevChannels[0] = FrontCenter; break;
- case DevFmtStereo: device->DevChannels[0] = FRONT_LEFT;
- device->DevChannels[1] = FRONT_RIGHT; break;
+ case DevFmtStereo: device->DevChannels[0] = FrontLeft;
+ device->DevChannels[1] = FrontRight; break;
- case DevFmtQuad: device->DevChannels[0] = FRONT_LEFT;
- device->DevChannels[1] = FRONT_RIGHT;
- device->DevChannels[2] = BACK_LEFT;
- device->DevChannels[3] = BACK_RIGHT; break;
+ case DevFmtQuad: device->DevChannels[0] = FrontLeft;
+ device->DevChannels[1] = FrontRight;
+ device->DevChannels[2] = BackLeft;
+ device->DevChannels[3] = BackRight; break;
- case DevFmtX51: device->DevChannels[0] = FRONT_LEFT;
- device->DevChannels[1] = FRONT_RIGHT;
- device->DevChannels[2] = FRONT_CENTER;
+ case DevFmtX51: device->DevChannels[0] = FrontLeft;
+ device->DevChannels[1] = FrontRight;
+ device->DevChannels[2] = FrontCenter;
device->DevChannels[3] = LFE;
- device->DevChannels[4] = BACK_LEFT;
- device->DevChannels[5] = BACK_RIGHT; break;
+ device->DevChannels[4] = BackLeft;
+ device->DevChannels[5] = BackRight; break;
- case DevFmtX51Side: device->DevChannels[0] = FRONT_LEFT;
- device->DevChannels[1] = FRONT_RIGHT;
- device->DevChannels[2] = FRONT_CENTER;
+ case DevFmtX51Side: device->DevChannels[0] = FrontLeft;
+ device->DevChannels[1] = FrontRight;
+ device->DevChannels[2] = FrontCenter;
device->DevChannels[3] = LFE;
- device->DevChannels[4] = SIDE_LEFT;
- device->DevChannels[5] = SIDE_RIGHT; break;
+ device->DevChannels[4] = SideLeft;
+ device->DevChannels[5] = SideRight; break;
- case DevFmtX61: device->DevChannels[0] = FRONT_LEFT;
- device->DevChannels[1] = FRONT_RIGHT;
- device->DevChannels[2] = FRONT_CENTER;
+ case DevFmtX61: device->DevChannels[0] = FrontLeft;
+ device->DevChannels[1] = FrontRight;
+ device->DevChannels[2] = FrontCenter;
device->DevChannels[3] = LFE;
- device->DevChannels[4] = BACK_CENTER;
- device->DevChannels[5] = SIDE_LEFT;
- device->DevChannels[6] = SIDE_RIGHT; break;
+ device->DevChannels[4] = BackCenter;
+ device->DevChannels[5] = SideLeft;
+ device->DevChannels[6] = SideRight; break;
- case DevFmtX71: device->DevChannels[0] = FRONT_LEFT;
- device->DevChannels[1] = FRONT_RIGHT;
- device->DevChannels[2] = FRONT_CENTER;
+ case DevFmtX71: device->DevChannels[0] = FrontLeft;
+ device->DevChannels[1] = FrontRight;
+ device->DevChannels[2] = FrontCenter;
device->DevChannels[3] = LFE;
- device->DevChannels[4] = BACK_LEFT;
- device->DevChannels[5] = BACK_RIGHT;
- device->DevChannels[6] = SIDE_LEFT;
- device->DevChannels[7] = SIDE_RIGHT; break;
+ device->DevChannels[4] = BackLeft;
+ device->DevChannels[5] = BackRight;
+ device->DevChannels[6] = SideLeft;
+ device->DevChannels[7] = SideRight; break;
}
}
@@ -1276,22 +1276,22 @@ void SetDefaultChannelOrder(ALCdevice *device)
{
switch(device->FmtChans)
{
- case DevFmtX51: device->DevChannels[0] = FRONT_LEFT;
- device->DevChannels[1] = FRONT_RIGHT;
- device->DevChannels[2] = BACK_LEFT;
- device->DevChannels[3] = BACK_RIGHT;
- device->DevChannels[4] = FRONT_CENTER;
+ case DevFmtX51: device->DevChannels[0] = FrontLeft;
+ device->DevChannels[1] = FrontRight;
+ device->DevChannels[2] = BackLeft;
+ device->DevChannels[3] = BackRight;
+ device->DevChannels[4] = FrontCenter;
device->DevChannels[5] = LFE;
return;
- case DevFmtX71: device->DevChannels[0] = FRONT_LEFT;
- device->DevChannels[1] = FRONT_RIGHT;
- device->DevChannels[2] = BACK_LEFT;
- device->DevChannels[3] = BACK_RIGHT;
- device->DevChannels[4] = FRONT_CENTER;
+ case DevFmtX71: device->DevChannels[0] = FrontLeft;
+ device->DevChannels[1] = FrontRight;
+ device->DevChannels[2] = BackLeft;
+ device->DevChannels[3] = BackRight;
+ device->DevChannels[4] = FrontCenter;
device->DevChannels[5] = LFE;
- device->DevChannels[6] = SIDE_LEFT;
- device->DevChannels[7] = SIDE_RIGHT;
+ device->DevChannels[6] = SideLeft;
+ device->DevChannels[7] = SideRight;
return;
/* Same as WFX order */
@@ -1533,7 +1533,7 @@ static ALCenum UpdateDeviceParams(ALCdevice *device, const ALCint *attrList)
aluInitPanning(device);
- for(i = 0;i < MAXCHANNELS;i++)
+ for(i = 0;i < MaxChannels;i++)
{
device->ClickRemoval[i] = 0.0f;
device->PendingClicks[i] = 0.0f;