From 144e30a9490fd86ca6ee00fdd3823ed3e99529c1 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Fri, 15 Apr 2022 01:45:24 -0700 Subject: [PATCH] Update the ALC_SOFT_output_mode surround enums The values are identical to the matching loopback channel configuration enums, so for example ALC_5POINT1_SOFT is interchangable with ALC_SURROUND_5_1_SOFT, this is simply providing a cleaner styling for potential future modes. --- alc/alc.cpp | 3 +++ alc/device.h | 6 +++--- alc/inprogext.h | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/alc/alc.cpp b/alc/alc.cpp index c57c08ba..d48c81e9 100644 --- a/alc/alc.cpp +++ b/alc/alc.cpp @@ -541,6 +541,9 @@ constexpr struct { DECL(ALC_STEREO_BASIC_SOFT), DECL(ALC_STEREO_UHJ_SOFT), DECL(ALC_STEREO_HRTF_SOFT), + DECL(ALC_SURROUND_5_1_SOFT), + DECL(ALC_SURROUND_6_1_SOFT), + DECL(ALC_SURROUND_7_1_SOFT), DECL(ALC_NO_ERROR), DECL(ALC_INVALID_DEVICE), diff --git a/alc/device.h b/alc/device.h index 44dfebd5..62ed0346 100644 --- a/alc/device.h +++ b/alc/device.h @@ -105,9 +105,9 @@ struct ALCdevice : public al::intrusive_ref, DeviceBase { Uhj2 = ALC_STEREO_UHJ_SOFT, Hrtf = ALC_STEREO_HRTF_SOFT, Quad = ALC_QUAD_SOFT, - X51 = ALC_5POINT1_SOFT, - X61 = ALC_6POINT1_SOFT, - X71 = ALC_7POINT1_SOFT + X51 = ALC_SURROUND_5_1_SOFT, + X61 = ALC_SURROUND_6_1_SOFT, + X71 = ALC_SURROUND_7_1_SOFT }; OutputMode1 getOutputMode1() const noexcept; diff --git a/alc/inprogext.h b/alc/inprogext.h index 8a0e784f..7dec7f81 100644 --- a/alc/inprogext.h +++ b/alc/inprogext.h @@ -64,9 +64,9 @@ AL_API void AL_APIENTRY alAuxiliaryEffectSlotStopvSOFT(ALsizei n, const ALuint * #define ALC_STEREO_UHJ_SOFT 0x19AF #define ALC_STEREO_HRTF_SOFT 0x19B2 /*#define ALC_QUAD_SOFT 0x1503*/ -/*#define ALC_5POINT1_SOFT 0x1504*/ -/*#define ALC_6POINT1_SOFT 0x1505*/ -/*#define ALC_7POINT1_SOFT 0x1506*/ +#define ALC_SURROUND_5_1_SOFT 0x1504 +#define ALC_SURROUND_6_1_SOFT 0x1505 +#define ALC_SURROUND_7_1_SOFT 0x1506 #endif -- 2.11.4.GIT