From 1f3c1091d3b92272bf00249904c79ac8af495811 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Mon, 12 Mar 2012 22:46:13 -0700 Subject: [PATCH] Finalize AL_SOFT_direct_channels --- Alc/ALc.c | 2 +- OpenAL32/Include/alMain.h | 5 ----- include/AL/alext.h | 5 +++++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Alc/ALc.c b/Alc/ALc.c index 1dc4f609..e70886ef 100644 --- a/Alc/ALc.c +++ b/Alc/ALc.c @@ -375,7 +375,7 @@ static const ALchar alExtList[] = "AL_EXT_IMA4 AL_EXT_LINEAR_DISTANCE AL_EXT_MCFORMATS AL_EXT_MULAW " "AL_EXT_MULAW_MCFORMATS AL_EXT_OFFSET AL_EXT_source_distance_model " "AL_LOKI_quadriphonic AL_SOFT_buffer_samples AL_SOFT_buffer_sub_data " - "AL_SOFTX_deferred_updates AL_SOFTX_direct_channels AL_SOFT_loop_points"; + "AL_SOFTX_deferred_updates AL_SOFT_direct_channels AL_SOFT_loop_points"; // Mixing Priority Level ALint RTPrioLevel; diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index 20f6d656..3b5e00bb 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -49,11 +49,6 @@ ALC_API void ALC_APIENTRY alcRenderSamplesSOFT(ALCdevice *device, ALCvoid *buffe #endif #endif -#ifndef AL_SOFT_direct_channels -#define AL_SOFT_direct_channels 1 -#define AL_DIRECT_CHANNELS_SOFT 0x1033 -#endif - #ifndef AL_SOFT_deferred_updates #define AL_SOFT_deferred_updates 1 #define AL_DEFERRED_UPDATES_SOFT 0xC002 diff --git a/include/AL/alext.h b/include/AL/alext.h index c8701fc3..11c4af9e 100644 --- a/include/AL/alext.h +++ b/include/AL/alext.h @@ -252,6 +252,11 @@ AL_API ALboolean AL_APIENTRY alIsBufferFormatSupportedSOFT(ALenum format); #endif #endif +#ifndef AL_SOFT_direct_channels +#define AL_SOFT_direct_channels 1 +#define AL_DIRECT_CHANNELS_SOFT 0x1033 +#endif + #ifdef __cplusplus } #endif -- 2.11.4.GIT