diff options
| author | Chris Robinson <[email protected]> | 2020-01-05 03:45:35 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2020-01-05 03:45:35 -0800 |
| commit | 6ed8061cbf6bbc17c4591d7e50bf9c97aad7a889 (patch) | |
| tree | bd0f3854d489db423857710d5abe9d1af4005ee8 /alc | |
| parent | 0d0ea586b6e7e8440fec807309cc97aa727d2bb0 (diff) | |
Finalize AL_SOFT_bformat_ex
Diffstat (limited to 'alc')
| -rw-r--r-- | alc/alc.cpp | 9 | ||||
| -rw-r--r-- | alc/inprogext.h | 15 |
2 files changed, 8 insertions, 16 deletions
diff --git a/alc/alc.cpp b/alc/alc.cpp index 31b57e35..4b2717fb 100644 --- a/alc/alc.cpp +++ b/alc/alc.cpp @@ -785,6 +785,13 @@ constexpr struct { DECL(AL_DROP_UNMATCHED_SOFT), DECL(AL_REMIX_UNMATCHED_SOFT), + + DECL(AL_AMBISONIC_LAYOUT_SOFT), + DECL(AL_AMBISONIC_SCALING_SOFT), + DECL(AL_FUMA_SOFT), + DECL(AL_ACN_SOFT), + DECL(AL_SN3D_SOFT), + DECL(AL_N3D_SOFT), }; #undef DECL @@ -828,7 +835,7 @@ constexpr ALchar alExtList[] = "AL_EXT_SOURCE_RADIUS " "AL_EXT_STEREO_ANGLES " "AL_LOKI_quadriphonic " - "AL_SOFTX_bformat_ex " + "AL_SOFT_bformat_ex " "AL_SOFT_block_alignment " "AL_SOFT_deferred_updates " "AL_SOFT_direct_channels " diff --git a/alc/inprogext.h b/alc/inprogext.h index d1890e70..ad3ea288 100644 --- a/alc/inprogext.h +++ b/alc/inprogext.h @@ -77,21 +77,6 @@ AL_API void AL_APIENTRY alGetPointervSOFT(ALenum pname, void **values); #define AL_EFFECTSLOT_TARGET_SOFT 0xf000 #endif -#ifndef AL_SOFT_bformat_ex -#define AL_SOFT_bformat_ex -#define AL_AMBISONIC_LAYOUT_SOFT 0x1997 -#define AL_AMBISONIC_SCALING_SOFT 0x1998 - -/* Ambisonic layouts */ -#define AL_FUMA_SOFT 0x0000 -#define AL_ACN_SOFT 0x0001 - -/* Ambisonic scalings (normalization) */ -/*#define AL_FUMA_SOFT*/ -#define AL_SN3D_SOFT 0x0001 -#define AL_N3D_SOFT 0x0002 -#endif - #ifdef __cplusplus } /* extern "C" */ #endif |