From 4ca8992fbd8a367973f23046a4f6b23980090e18 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Sat, 26 Mar 2022 22:25:13 -0700
Subject: Rename ALC_STEREO_PLAIN_SOFT and don't duplicate ALC_HRTF_SOFT
---
alc/alc.cpp | 6 +++---
alc/device.cpp | 2 +-
alc/device.h | 2 +-
alc/inprogext.h | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
(limited to 'alc')
diff --git a/alc/alc.cpp b/alc/alc.cpp
index 9abcde60..f6bbcb59 100644
--- a/alc/alc.cpp
+++ b/alc/alc.cpp
@@ -538,7 +538,7 @@ constexpr struct {
DECL(ALC_OUTPUT_MODE_SOFT),
DECL(ALC_ANY_SOFT),
- DECL(ALC_STEREO_PLAIN_SOFT),
+ DECL(ALC_STEREO_BASIC_SOFT),
DECL(ALC_STEREO_UHJ_SOFT),
DECL(ALC_STEREO_HRTF_SOFT),
@@ -1757,7 +1757,7 @@ ALCenum UpdateDeviceParams(ALCdevice *device, const int *attrList)
if(opthrtf)
stereomode = *opthrtf ? StereoEncoding::Hrtf : StereoEncoding::Normal;
- if(outmode == ALC_STEREO_PLAIN_SOFT)
+ if(outmode == ALC_STEREO_BASIC_SOFT)
stereomode = StereoEncoding::Normal;
else if(outmode == ALC_STEREO_UHJ_SOFT)
stereomode = StereoEncoding::Uhj;
@@ -1811,7 +1811,7 @@ ALCenum UpdateDeviceParams(ALCdevice *device, const int *attrList)
case OutputMode::Any: break;
case OutputMode::Mono: set_device_mode(DevFmtMono); break;
case OutputMode::Stereo: set_device_mode(DevFmtStereo); break;
- case OutputMode::StereoPlain:
+ case OutputMode::StereoBasic:
set_device_mode(DevFmtStereo);
stereomode = StereoEncoding::Normal;
break;
diff --git a/alc/device.cpp b/alc/device.cpp
index 11f66df7..3a9b7380 100644
--- a/alc/device.cpp
+++ b/alc/device.cpp
@@ -76,7 +76,7 @@ auto ALCdevice::getOutputMode1() const noexcept -> OutputMode1
return OutputMode1::Hrtf;
else if(mUhjEncoder)
return OutputMode1::Uhj2;
- return OutputMode1::StereoPlain;
+ return OutputMode1::StereoBasic;
case DevFmtQuad: return OutputMode1::Quad;
case DevFmtX51: return OutputMode1::X51;
case DevFmtX61: return OutputMode1::X61;
diff --git a/alc/device.h b/alc/device.h
index 9d8c2f15..44dfebd5 100644
--- a/alc/device.h
+++ b/alc/device.h
@@ -101,7 +101,7 @@ struct ALCdevice : public al::intrusive_ref<ALCdevice>, DeviceBase {
Any = ALC_ANY_SOFT,
Mono = ALC_MONO_SOFT,
Stereo = ALC_STEREO_SOFT,
- StereoPlain = ALC_STEREO_PLAIN_SOFT,
+ StereoBasic = ALC_STEREO_BASIC_SOFT,
Uhj2 = ALC_STEREO_UHJ_SOFT,
Hrtf = ALC_STEREO_HRTF_SOFT,
Quad = ALC_QUAD_SOFT,
diff --git a/alc/inprogext.h b/alc/inprogext.h
index 71e083a9..95d37461 100644
--- a/alc/inprogext.h
+++ b/alc/inprogext.h
@@ -105,9 +105,9 @@ ALCboolean ALC_APIENTRY alcReopenDeviceSOFT(ALCdevice *device, const ALCchar *de
#define ALC_ANY_SOFT 0x19AD
/*#define ALC_MONO_SOFT 0x1500*/
/*#define ALC_STEREO_SOFT 0x1501*/
-#define ALC_STEREO_PLAIN_SOFT 0x19AE
+#define ALC_STEREO_BASIC_SOFT 0x19AE
#define ALC_STEREO_UHJ_SOFT 0x19AF
-#define ALC_STEREO_HRTF_SOFT 0x1992 /* =ALC_HRTF_SOFT */
+#define ALC_STEREO_HRTF_SOFT 0x19B2
/*#define ALC_QUAD_SOFT 0x1503*/
/*#define ALC_5POINT1_SOFT 0x1504*/
/*#define ALC_6POINT1_SOFT 0x1505*/
--
cgit v1.2.3