From fda5bc2bd2dac0c39f420a8de639c42d34d545a3 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Thu, 3 Jul 2014 20:59:44 -0700 Subject: [PATCH] AL_SOFT_MSADPCM is functionally complete --- Alc/ALc.c | 2 +- OpenAL32/Include/alMain.h | 6 ------ include/AL/alext.h | 6 ++++++ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Alc/ALc.c b/Alc/ALc.c index e21cd8ed..3b78ce87 100644 --- a/Alc/ALc.c +++ b/Alc/ALc.c @@ -715,7 +715,7 @@ static const ALchar alExtList[] = "AL_EXT_MULAW_MCFORMATS AL_EXT_OFFSET AL_EXT_source_distance_model " "AL_LOKI_quadriphonic AL_SOFT_block_alignment AL_SOFT_buffer_samples " "AL_SOFT_buffer_sub_data AL_SOFT_deferred_updates AL_SOFT_direct_channels " - "AL_SOFT_loop_points AL_SOFTX_MSADPCM AL_SOFT_source_latency " + "AL_SOFT_loop_points AL_SOFT_MSADPCM AL_SOFT_source_latency " "AL_SOFTX_source_length"; static volatile ALCenum LastNullDeviceError = ALC_NO_ERROR; diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index c38a98f9..8cd270d7 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -245,12 +245,6 @@ ALC_API void ALC_APIENTRY alcGetInteger64vSOFT(ALCdevice *device, ALCenum pname, #endif #endif -#ifndef AL_SOFT_MSADPCM -#define AL_SOFT_MSADPCM 1 -#define AL_FORMAT_MONO_MSADPCM_SOFT 0x1302 -#define AL_FORMAT_STEREO_MSADPCM_SOFT 0x1303 -#endif - #ifdef IN_IDE_PARSER /* KDevelop's parser doesn't recognize the C99-standard restrict keyword, but diff --git a/include/AL/alext.h b/include/AL/alext.h index 33f3a034..e647d7be 100644 --- a/include/AL/alext.h +++ b/include/AL/alext.h @@ -370,6 +370,12 @@ AL_API ALvoid AL_APIENTRY alProcessUpdatesSOFT(void); #define AL_PACK_BLOCK_ALIGNMENT_SOFT 0x200D #endif +#ifndef AL_SOFT_MSADPCM +#define AL_SOFT_MSADPCM 1 +#define AL_FORMAT_MONO_MSADPCM_SOFT 0x1302 +#define AL_FORMAT_STEREO_MSADPCM_SOFT 0x1303 +#endif + #ifdef __cplusplus } #endif -- 2.11.4.GIT