aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2017-05-03 04:33:38 -0700
committerChris Robinson <[email protected]>2017-05-03 04:33:38 -0700
commitab1cca729f561d8c13f87e55548173ee9bb3f3fe (patch)
tree05aad2170f674897a69544b80f7c40efc9b71572
parent732dee5375b2b2debf30ed81eb52c3cc058499fc (diff)
Finalize AL_SOFT_source_resampler
-rw-r--r--Alc/ALc.c2
-rw-r--r--OpenAL32/Include/alMain.h13
-rw-r--r--include/AL/alext.h12
3 files changed, 13 insertions, 14 deletions
diff --git a/Alc/ALc.c b/Alc/ALc.c
index d5286f4f..40786a42 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -735,7 +735,7 @@ static const ALchar alExtList[] =
"AL_LOKI_quadriphonic AL_SOFT_block_alignment AL_SOFT_deferred_updates "
"AL_SOFT_direct_channels AL_SOFT_gain_clamp_ex AL_SOFT_loop_points "
"AL_SOFT_MSADPCM AL_SOFT_source_latency AL_SOFT_source_length "
- "AL_SOFTX_source_resampler";
+ "AL_SOFT_source_resampler";
static ATOMIC(ALCenum) LastNullDeviceError = ATOMIC_INIT_STATIC(ALC_NO_ERROR);
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index 32865cae..1ace123c 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -139,19 +139,6 @@ AL_API ALboolean AL_APIENTRY alIsBufferFormatSupportedSOFT(ALenum format);
#endif
#endif
-#ifndef AL_SOFT_source_resampler
-#define AL_SOFT_source_resampler
-#define AL_NUM_RESAMPLERS_SOFT 0x1210
-#define AL_DEFAULT_RESAMPLER_SOFT 0x1211
-#define AL_SOURCE_RESAMPLER_SOFT 0x1212
-#define AL_RESAMPLER_NAME_SOFT 0x1213
-
-typedef const ALchar* (AL_APIENTRY*LPALGETSTRINGISOFT)(ALenum pname, ALsizei index);
-#ifdef AL_ALEXT_PROTOTYPES
-AL_API const ALchar* AL_APIENTRY alGetStringiSOFT(ALenum pname, ALsizei index);
-#endif
-#endif
-
#ifndef ALC_SOFT_output_limiter
#define ALC_SOFT_output_limiter
#define ALC_OUTPUT_LIMITER_SOFT 0x199A
diff --git a/include/AL/alext.h b/include/AL/alext.h
index 0090c804..50ad10ec 100644
--- a/include/AL/alext.h
+++ b/include/AL/alext.h
@@ -436,6 +436,18 @@ ALC_API ALCboolean ALC_APIENTRY alcResetDeviceSOFT(ALCdevice *device, const ALCi
#define AL_GAIN_LIMIT_SOFT 0x200E
#endif
+#ifndef AL_SOFT_source_resampler
+#define AL_SOFT_source_resampler
+#define AL_NUM_RESAMPLERS_SOFT 0x1210
+#define AL_DEFAULT_RESAMPLER_SOFT 0x1211
+#define AL_SOURCE_RESAMPLER_SOFT 0x1212
+#define AL_RESAMPLER_NAME_SOFT 0x1213
+typedef const ALchar* (AL_APIENTRY*LPALGETSTRINGISOFT)(ALenum pname, ALsizei index);
+#ifdef AL_ALEXT_PROTOTYPES
+AL_API const ALchar* AL_APIENTRY alGetStringiSOFT(ALenum pname, ALsizei index);
+#endif
+#endif
+
#ifdef __cplusplus
}
#endif