diff options
| -rw-r--r-- | alc/alc.cpp | 2 | ||||
| -rw-r--r-- | alc/inprogext.h | 22 | ||||
| -rw-r--r-- | examples/alffplay.cpp | 16 | ||||
| -rw-r--r-- | include/AL/alext.h | 22 |
4 files changed, 23 insertions, 39 deletions
diff --git a/alc/alc.cpp b/alc/alc.cpp index 9c4be5ed..c4fdad95 100644 --- a/alc/alc.cpp +++ b/alc/alc.cpp @@ -867,7 +867,7 @@ constexpr ALchar alExtList[] = "AL_SOFT_direct_channels " "AL_SOFT_direct_channels_remix " "AL_SOFT_effect_target " - "AL_SOFTX_events " + "AL_SOFT_events " "AL_SOFTX_filter_gain_ex " "AL_SOFT_gain_clamp_ex " "AL_SOFT_loop_points " diff --git a/alc/inprogext.h b/alc/inprogext.h index e33af999..ea27a531 100644 --- a/alc/inprogext.h +++ b/alc/inprogext.h @@ -28,28 +28,6 @@ AL_API void AL_APIENTRY alFlushMappedBufferSOFT(ALuint buffer, ALsizei offset, A #endif #endif -#ifndef AL_SOFT_events -#define AL_SOFT_events 1 -#define AL_EVENT_CALLBACK_FUNCTION_SOFT 0x19A2 -#define AL_EVENT_CALLBACK_USER_PARAM_SOFT 0x19A3 -#define AL_EVENT_TYPE_BUFFER_COMPLETED_SOFT 0x19A4 -#define AL_EVENT_TYPE_SOURCE_STATE_CHANGED_SOFT 0x19A5 -#define AL_EVENT_TYPE_DISCONNECTED_SOFT 0x19A6 -typedef void (AL_APIENTRY*ALEVENTPROCSOFT)(ALenum eventType, ALuint object, ALuint param, - ALsizei length, const ALchar *message, - void *userParam); -typedef void (AL_APIENTRY*LPALEVENTCONTROLSOFT)(ALsizei count, const ALenum *types, ALboolean enable); -typedef void (AL_APIENTRY*LPALEVENTCALLBACKSOFT)(ALEVENTPROCSOFT callback, void *userParam); -typedef void* (AL_APIENTRY*LPALGETPOINTERSOFT)(ALenum pname); -typedef void (AL_APIENTRY*LPALGETPOINTERVSOFT)(ALenum pname, void **values); -#ifdef AL_ALEXT_PROTOTYPES -AL_API void AL_APIENTRY alEventControlSOFT(ALsizei count, const ALenum *types, ALboolean enable); -AL_API void AL_APIENTRY alEventCallbackSOFT(ALEVENTPROCSOFT callback, void *userParam); -AL_API void* AL_APIENTRY alGetPointerSOFT(ALenum pname); -AL_API void AL_APIENTRY alGetPointervSOFT(ALenum pname, void **values); -#endif -#endif - #ifndef AL_SOFT_callback_buffer #define AL_SOFT_callback_buffer #define AL_BUFFER_CALLBACK_FUNCTION_SOFT 0x19A0 diff --git a/examples/alffplay.cpp b/examples/alffplay.cpp index 8d4ab3c8..57021135 100644 --- a/examples/alffplay.cpp +++ b/examples/alffplay.cpp @@ -75,22 +75,6 @@ extern "C" { #define ALLOW_EXPERIMENTAL_EXTS #ifdef ALLOW_EXPERIMENTAL_EXTS -#ifndef AL_SOFT_events -#define AL_SOFT_events 1 -#define AL_EVENT_CALLBACK_FUNCTION_SOFT 0x19A2 -#define AL_EVENT_CALLBACK_USER_PARAM_SOFT 0x19A3 -#define AL_EVENT_TYPE_BUFFER_COMPLETED_SOFT 0x19A4 -#define AL_EVENT_TYPE_SOURCE_STATE_CHANGED_SOFT 0x19A5 -#define AL_EVENT_TYPE_DISCONNECTED_SOFT 0x19A6 -typedef void (AL_APIENTRY*ALEVENTPROCSOFT)(ALenum eventType, ALuint object, ALuint param, - ALsizei length, const ALchar *message, - void *userParam); -typedef void (AL_APIENTRY*LPALEVENTCONTROLSOFT)(ALsizei count, const ALenum *types, ALboolean enable); -typedef void (AL_APIENTRY*LPALEVENTCALLBACKSOFT)(ALEVENTPROCSOFT callback, void *userParam); -typedef void* (AL_APIENTRY*LPALGETPOINTERSOFT)(ALenum pname); -typedef void (AL_APIENTRY*LPALGETPOINTERVSOFT)(ALenum pname, void **values); -#endif - #ifndef AL_SOFT_callback_buffer #define AL_SOFT_callback_buffer typedef unsigned int ALbitfieldSOFT; diff --git a/include/AL/alext.h b/include/AL/alext.h index 4714ba9b..ef5e8cb6 100644 --- a/include/AL/alext.h +++ b/include/AL/alext.h @@ -556,6 +556,28 @@ ALC_API void ALC_APIENTRY alcGetInteger64vSOFT(ALCdevice *device, ALCenum pname, #define AL_EFFECTSLOT_TARGET_SOFT 0x199C #endif +#ifndef AL_SOFT_events +#define AL_SOFT_events 1 +#define AL_EVENT_CALLBACK_FUNCTION_SOFT 0x19A2 +#define AL_EVENT_CALLBACK_USER_PARAM_SOFT 0x19A3 +#define AL_EVENT_TYPE_BUFFER_COMPLETED_SOFT 0x19A4 +#define AL_EVENT_TYPE_SOURCE_STATE_CHANGED_SOFT 0x19A5 +#define AL_EVENT_TYPE_DISCONNECTED_SOFT 0x19A6 +typedef void (AL_APIENTRY*ALEVENTPROCSOFT)(ALenum eventType, ALuint object, ALuint param, + ALsizei length, const ALchar *message, + void *userParam); +typedef void (AL_APIENTRY*LPALEVENTCONTROLSOFT)(ALsizei count, const ALenum *types, ALboolean enable); +typedef void (AL_APIENTRY*LPALEVENTCALLBACKSOFT)(ALEVENTPROCSOFT callback, void *userParam); +typedef void* (AL_APIENTRY*LPALGETPOINTERSOFT)(ALenum pname); +typedef void (AL_APIENTRY*LPALGETPOINTERVSOFT)(ALenum pname, void **values); +#ifdef AL_ALEXT_PROTOTYPES +AL_API void AL_APIENTRY alEventControlSOFT(ALsizei count, const ALenum *types, ALboolean enable); +AL_API void AL_APIENTRY alEventCallbackSOFT(ALEVENTPROCSOFT callback, void *userParam); +AL_API void* AL_APIENTRY alGetPointerSOFT(ALenum pname); +AL_API void AL_APIENTRY alGetPointervSOFT(ALenum pname, void **values); +#endif +#endif + #ifdef __cplusplus } #endif |