Update the layout config option names

This commit is contained in:
Chris Robinson
2012-03-01 10:06:55 -08:00
parent 06debb153d
commit 6ffaabeb75
2 changed files with 11 additions and 11 deletions
+6 -6
View File
@@ -189,7 +189,7 @@ ALvoid aluInitPanning(ALCdevice *Device)
Speaker2Chan[1] = FRONT_RIGHT;
SpeakerAngle[0] = F_PI/180.0f * -30.0f;
SpeakerAngle[1] = F_PI/180.0f * 30.0f;
layoutname = "layout_STEREO";
layoutname = "layout_stereo";
break;
case DevFmtQuad:
@@ -202,7 +202,7 @@ ALvoid aluInitPanning(ALCdevice *Device)
SpeakerAngle[1] = F_PI/180.0f * -45.0f;
SpeakerAngle[2] = F_PI/180.0f * 45.0f;
SpeakerAngle[3] = F_PI/180.0f * 135.0f;
layoutname = "layout_QUAD";
layoutname = "layout_quad";
break;
case DevFmtX51:
@@ -217,7 +217,7 @@ ALvoid aluInitPanning(ALCdevice *Device)
SpeakerAngle[2] = F_PI/180.0f * 0.0f;
SpeakerAngle[3] = F_PI/180.0f * 30.0f;
SpeakerAngle[4] = F_PI/180.0f * 110.0f;
layoutname = "layout_51CHN";
layoutname = "layout_surround51";
break;
case DevFmtX51Side:
@@ -232,7 +232,7 @@ ALvoid aluInitPanning(ALCdevice *Device)
SpeakerAngle[2] = F_PI/180.0f * 0.0f;
SpeakerAngle[3] = F_PI/180.0f * 30.0f;
SpeakerAngle[4] = F_PI/180.0f * 90.0f;
layoutname = "layout_51SIDECHN";
layoutname = "layout_side51";
break;
case DevFmtX61:
@@ -249,7 +249,7 @@ ALvoid aluInitPanning(ALCdevice *Device)
SpeakerAngle[3] = F_PI/180.0f * 30.0f;
SpeakerAngle[4] = F_PI/180.0f * 90.0f;
SpeakerAngle[5] = F_PI/180.0f * 180.0f;
layoutname = "layout_61CHN";
layoutname = "layout_surround61";
break;
case DevFmtX71:
@@ -268,7 +268,7 @@ ALvoid aluInitPanning(ALCdevice *Device)
SpeakerAngle[4] = F_PI/180.0f * 30.0f;
SpeakerAngle[5] = F_PI/180.0f * 90.0f;
SpeakerAngle[6] = F_PI/180.0f * 150.0f;
layoutname = "layout_71CHN";
layoutname = "layout_surround71";
break;
}
if(layoutname && Device->Type != Loopback)
+5 -5
View File
@@ -138,11 +138,11 @@
# Channel-specific layouts may be specified to override the layout option. The
# same speakers as the layout option are available, and the default settings
# are shown below.
#layout_STEREO = fl=-30, fr=30
#layout_QUAD = fl=-45, fr=45, bl=-135, br=135
#layout_51CHN = fl=-30, fr=30, fc=0, bl=-110, br=110
#layout_61CHN = fl=-30, fr=30, fc=0, sl=-90, sr=90, bc=180
#layout_71CHN = fl=-30, fr=30, fc=0, sl=-90, sr=90, bl=-150, br=150
#layout_stereo = fl=-30, fr=30
#layout_quad = fl=-45, fr=45, bl=-135, br=135
#layout_surround51 = fl=-30, fr=30, fc=0, bl=-110, br=110
#layout_surround61 = fl=-30, fr=30, fc=0, sl=-90, sr=90, bc=180
#layout_surround71 = fl=-30, fr=30, fc=0, sl=-90, sr=90, bl=-150, br=150
## default-reverb:
# A reverb preset that applies by default to all sources on send 0