diff options
| author | Chris Robinson <[email protected]> | 2018-12-27 01:18:10 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2018-12-27 01:18:10 -0800 |
| commit | 7d821551ac32c6775d1f02a4631bd050aabcc254 (patch) | |
| tree | d3a1cc1d9485627e5ec9a8c3c7e8eb18d8073330 | |
| parent | d367093c0616e561a14ca1c486aff99cde98f4be (diff) | |
Recognize ambix as an alias for acn+sn3d
| -rw-r--r-- | Alc/alc.cpp | 2 | ||||
| -rw-r--r-- | alsoftrc.sample | 4 | ||||
| -rw-r--r-- | utils/alsoft-config/mainwindow.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Alc/alc.cpp b/Alc/alc.cpp index 294ba394..27475652 100644 --- a/Alc/alc.cpp +++ b/Alc/alc.cpp @@ -3806,7 +3806,7 @@ ALC_API ALCdevice* ALC_APIENTRY alcOpenDevice(const ALCchar *deviceName) device->mAmbiScale = AmbiNorm::FuMa; } } - else if(strcasecmp(fmt, "acn+sn3d") == 0) + else if(strcasecmp(fmt, "ambix") == 0 || strcasecmp(fmt, "acn+sn3d") == 0) { device->mAmbiLayout = AmbiLayout::ACN; device->mAmbiScale = AmbiNorm::SN3D; diff --git a/alsoftrc.sample b/alsoftrc.sample index f18899a0..1c1e113d 100644 --- a/alsoftrc.sample +++ b/alsoftrc.sample @@ -100,8 +100,8 @@ ## ambi-format: # Specifies the channel order and normalization for the "ambi*" set of channel -# configurations. Valid settings are: fuma, acn+sn3d, acn+n3d -#ambi-format = acn+sn3d +# configurations. Valid settings are: fuma, ambix (or acn+sn3d), acn+n3d +#ambi-format = ambix ## hrtf: # Controls HRTF processing. These filters provide better spatialization of diff --git a/utils/alsoft-config/mainwindow.cpp b/utils/alsoft-config/mainwindow.cpp index 2b873955..449c91e5 100644 --- a/utils/alsoft-config/mainwindow.cpp +++ b/utils/alsoft-config/mainwindow.cpp @@ -119,8 +119,8 @@ static const struct NameValuePair { { "", "" } }, ambiFormatList[] = { { "Default", "" }, - { "ACN + SN3D", "acn+sn3d" }, - { "ACN + N3D", "acn+n3d" }, + { "AmbiX (ACN, SN3D)", "ambix" }, + { "ACN, N3D", "acn+n3d" }, { "Furse-Malham", "fuma" }, { "", "" } |