diff options
| author | Chris Robinson <[email protected]> | 2011-01-23 23:57:39 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2011-01-23 23:57:39 -0800 |
| commit | 02e0223fe8a2f80f296fe08c4e19b7cbf8062ff8 (patch) | |
| tree | 65b8d566a9c13aa52f813ba3c3597ac28f8ad88e | |
| parent | 6c4add67e182f40dcd856216c48079c4fb04455d (diff) | |
Re-enable channel-config-specific layout options
| -rw-r--r-- | Alc/panning.c | 13 | ||||
| -rw-r--r-- | alsoftrc.sample | 10 |
2 files changed, 18 insertions, 5 deletions
diff --git a/Alc/panning.c b/Alc/panning.c index 4c055264..dec2a361 100644 --- a/Alc/panning.c +++ b/Alc/panning.c @@ -40,6 +40,9 @@ static void SetSpeakerArrangement(const char *name, ALfloat SpeakerAngle[MAXCHAN Channel val; int i; + if(!ConfigValueExists(NULL, name)) + name = "layout"; + strncpy(layout_str, GetConfigValue(NULL, name, ""), sizeof(layout_str)); layout_str[sizeof(layout_str)-1] = 0; @@ -207,7 +210,7 @@ ALvoid aluInitPanning(ALCdevice *Device) Speaker2Chan[1] = FRONT_RIGHT; SpeakerAngle[0] = -90.0f * M_PI/180.0f; SpeakerAngle[1] = 90.0f * M_PI/180.0f; - SetSpeakerArrangement("layout", SpeakerAngle, Speaker2Chan, Device->NumChan); + SetSpeakerArrangement("layout_STEREO", SpeakerAngle, Speaker2Chan, Device->NumChan); break; case DevFmtQuad: @@ -228,7 +231,7 @@ ALvoid aluInitPanning(ALCdevice *Device) SpeakerAngle[1] = -45.0f * M_PI/180.0f; SpeakerAngle[2] = 45.0f * M_PI/180.0f; SpeakerAngle[3] = 135.0f * M_PI/180.0f; - SetSpeakerArrangement("layout", SpeakerAngle, Speaker2Chan, Device->NumChan); + SetSpeakerArrangement("layout_QUAD", SpeakerAngle, Speaker2Chan, Device->NumChan); break; case DevFmtX51: @@ -249,7 +252,7 @@ ALvoid aluInitPanning(ALCdevice *Device) SpeakerAngle[2] = 0.0f * M_PI/180.0f; SpeakerAngle[3] = 30.0f * M_PI/180.0f; SpeakerAngle[4] = 110.0f * M_PI/180.0f; - SetSpeakerArrangement("layout", SpeakerAngle, Speaker2Chan, Device->NumChan); + SetSpeakerArrangement("layout_51CHN", SpeakerAngle, Speaker2Chan, Device->NumChan); break; case DevFmtX61: @@ -270,7 +273,7 @@ ALvoid aluInitPanning(ALCdevice *Device) SpeakerAngle[3] = 30.0f * M_PI/180.0f; SpeakerAngle[4] = 90.0f * M_PI/180.0f; SpeakerAngle[5] = 180.0f * M_PI/180.0f; - SetSpeakerArrangement("layout", SpeakerAngle, Speaker2Chan, Device->NumChan); + SetSpeakerArrangement("layout_61CHN", SpeakerAngle, Speaker2Chan, Device->NumChan); break; case DevFmtX71: @@ -291,7 +294,7 @@ ALvoid aluInitPanning(ALCdevice *Device) SpeakerAngle[4] = 30.0f * M_PI/180.0f; SpeakerAngle[5] = 90.0f * M_PI/180.0f; SpeakerAngle[6] = 150.0f * M_PI/180.0f; - SetSpeakerArrangement("layout", SpeakerAngle, Speaker2Chan, Device->NumChan); + SetSpeakerArrangement("layout_71CHN", SpeakerAngle, Speaker2Chan, Device->NumChan); break; } diff --git a/alsoftrc.sample b/alsoftrc.sample index 0ac27619..3a7af51b 100644 --- a/alsoftrc.sample +++ b/alsoftrc.sample @@ -150,6 +150,16 @@ # and back-center(bc). #layout = +## layout_*: +# 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=-90, fr=90 +#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 + ## ## ALSA backend stuff ## |