diff options
| -rw-r--r-- | alc/alc.cpp | 6 | ||||
| -rw-r--r-- | alc/context.cpp | 3 | ||||
| -rw-r--r-- | alc/inprogext.h | 9 | ||||
| -rw-r--r-- | include/AL/alext.h | 9 |
4 files changed, 17 insertions, 10 deletions
diff --git a/alc/alc.cpp b/alc/alc.cpp index 9915a853..eaf59fea 100644 --- a/alc/alc.cpp +++ b/alc/alc.cpp @@ -902,6 +902,12 @@ constexpr struct { DECL(AL_SUPER_STEREO_SOFT), DECL(AL_SUPER_STEREO_WIDTH_SOFT), + DECL(AL_FORMAT_UHJ2CHN_MULAW_SOFT), + DECL(AL_FORMAT_UHJ2CHN_IMA4_SOFT), + DECL(AL_FORMAT_UHJ2CHN_MSADPCM_SOFT), + DECL(AL_FORMAT_UHJ3CHN_MULAW_SOFT), + DECL(AL_FORMAT_UHJ4CHN_MULAW_SOFT), + DECL(AL_STOP_SOURCES_ON_DISCONNECT_SOFT), #ifdef ALSOFT_EAX diff --git a/alc/context.cpp b/alc/context.cpp index 0aacaac5..288f5965 100644 --- a/alc/context.cpp +++ b/alc/context.cpp @@ -79,7 +79,8 @@ constexpr ALchar alExtList[] = "AL_SOFT_source_resampler " "AL_SOFT_source_spatialize " "AL_SOFTX_source_start_delay " - "AL_SOFT_UHJ"; + "AL_SOFT_UHJ " + "AL_SOFT_UHJ_ex"; } // namespace diff --git a/alc/inprogext.h b/alc/inprogext.h index 284af05e..12196764 100644 --- a/alc/inprogext.h +++ b/alc/inprogext.h @@ -64,15 +64,6 @@ void AL_APIENTRY alSourcePlayAtTimevSOFT(ALsizei n, const ALuint *sources, ALint #endif #endif -#ifndef AL_SOFT_UHJ_ex -#define AL_SOFT_UHJ_ex -#define AL_FORMAT_UHJ2CHN_MULAW_SOFT 0x19B3 -#define AL_FORMAT_UHJ2CHN_IMA4_SOFT 0x19B4 -#define AL_FORMAT_UHJ2CHN_MSADPCM_SOFT 0x19B5 -#define AL_FORMAT_UHJ3CHN_MULAW_SOFT 0x19B6 -#define AL_FORMAT_UHJ4CHN_MULAW_SOFT 0x19B7 -#endif - /* Non-standard export. Not part of any extension. */ AL_API const ALchar* AL_APIENTRY alsoft_get_version(void); diff --git a/include/AL/alext.h b/include/AL/alext.h index 1cf8d684..e1e8eb56 100644 --- a/include/AL/alext.h +++ b/include/AL/alext.h @@ -604,6 +604,15 @@ AL_API void AL_APIENTRY alGetBufferPtrvSOFT(ALuint buffer, ALenum param, ALvoid #define AL_SUPER_STEREO_WIDTH_SOFT 0x19B1 #endif +#ifndef AL_SOFT_UHJ_ex +#define AL_SOFT_UHJ_ex +#define AL_FORMAT_UHJ2CHN_MULAW_SOFT 0x19B3 +#define AL_FORMAT_UHJ2CHN_IMA4_SOFT 0x19B4 +#define AL_FORMAT_UHJ2CHN_MSADPCM_SOFT 0x19B5 +#define AL_FORMAT_UHJ3CHN_MULAW_SOFT 0x19B6 +#define AL_FORMAT_UHJ4CHN_MULAW_SOFT 0x19B7 +#endif + #ifndef ALC_SOFT_output_mode #define ALC_SOFT_output_mode #define ALC_OUTPUT_MODE_SOFT 0x19AC |