Use a single layout for the virtual speakers

The downmix should probably be improved to take the angles into account

2 files changed, 7 insertions, 29 deletions

diff --git a/Alc/ALu.c b/Alc/ALu.c
index 22008fc3..57c99093 100644
--- a/Alc/ALu.c
+++ b/Alc/ALu.c
@@ -250,7 +250,7 @@ ALvoid aluInitPanning(ALCcontext *Context)
     SpeakerAngle[5] =   90.0f * M_PI/180.0f;
     SpeakerAngle[6] =  150.0f * M_PI/180.0f;
     SpeakerAngle[7] =  180.0f * M_PI/180.0f;
-    SetSpeakerArrangement("layout_81CHN", SpeakerAngle, Speaker2Chan, Context->NumChan);
+    SetSpeakerArrangement("layout", SpeakerAngle, Speaker2Chan, Context->NumChan);
 
     for(pos = 0; pos < LUT_NUM; pos++)
     {
diff --git a/alsoftrc.sample b/alsoftrc.sample
index 41e0309a..9dc533f4 100644
--- a/alsoftrc.sample
+++ b/alsoftrc.sample
@@ -129,35 +129,13 @@
 #  beyond the default (2).
 #sends = 2
 
-## layout_STEREO:
-#  Sets the speaker layout when using stereo output. Values are specified in
-#  degrees, where 0 is straight in front, negative goes left, and positive goes
-#  right. Unspecified speakers will remain at their default position. Available
-#  speakers are front-left(fl) and front-right(fr).
-#layout_STEREO = fl=-90, fr=90
-
-## laytout_QUAD:
-#  Sets the speaker layout when using quadriphonic output. Available speakers
-#  are back-left(bl), front-left(fl), front-right(fr), and back-right(br).
-#layout_QUAD = bl=-135, fl=-45, fr=45, br=135
-
-## layout_51CHN:
-#  Sets the speaker layout when using 5.1 output. Available speakers are back-
-#  left(bl), front-left(fl), front-center(fc), front-right(fr), and back-
-#  right(br).
-#layout_51CHN = bl=-110, fl=-30, fc=0, fr=30, br=110
-
-## layout_61CHN:
-#  Sets the speaker layout when using 6.1 output. Available speakers are side-
-#  left(sl), front-left(fl), front-center(fc), front-right(fr), side-right(sr),
-#  and back-center(bc).
-#layout_61CHN = sl=-90, fl=-30, fc=0, fr=30, sr=90, bc=180
-
-## layout_71CHN:
-#  Sets the speaker layout when using 7.1 output. Available speakers are back-
+## layout:
+#  Sets the virtual speaker layout. Values are specified in degrees, where 0 is
+#  straight in front, negative goes left, and positive goes right. Unspecified
+#  speakers will remain at their default position. Available speakers are back-
 #  left(bl), side-left(sl), front-left(fl), front-center(fc), front-right(fr),
-#  side-right(sr), and back-right(br).
-#layout_71CHN = bl=-150, sl=-90, fl=-30, fc=0, fr=30, sr=90, br=150
+#  side-right(sr), back-right(br), and back-center(bc).
+#layout = bl=-150, sl=-90, fl=-30, fc=0, fr=30, sr=90, br=150, bc=180
 
 ##
 ## ALSA backend stuff