diff options
Diffstat (limited to 'alc')
| -rw-r--r-- | alc/alc.cpp | 4 | ||||
| -rw-r--r-- | alc/export_list.h | 6 | ||||
| -rw-r--r-- | alc/inprogext.h | 17 |
3 files changed, 8 insertions, 19 deletions
diff --git a/alc/alc.cpp b/alc/alc.cpp index b2a5355a..6163e004 100644 --- a/alc/alc.cpp +++ b/alc/alc.cpp @@ -307,7 +307,7 @@ constexpr ALCchar alcNoDeviceExtList[] = "ALC_SOFT_loopback " "ALC_SOFT_loopback_bformat " "ALC_SOFT_reopen_device " - "ALC_SOFTX_system_events"; + "ALC_SOFT_system_events"; constexpr ALCchar alcExtensionList[] = "ALC_ENUMERATE_ALL_EXT " "ALC_ENUMERATION_EXT " @@ -326,7 +326,7 @@ constexpr ALCchar alcExtensionList[] = "ALC_SOFT_output_mode " "ALC_SOFT_pause_device " "ALC_SOFT_reopen_device " - "ALC_SOFTX_system_events"; + "ALC_SOFT_system_events"; constexpr int alcMajorVersion{1}; constexpr int alcMinorVersion{1}; diff --git a/alc/export_list.h b/alc/export_list.h index 89d394a8..9e92570e 100644 --- a/alc/export_list.h +++ b/alc/export_list.h @@ -489,6 +489,12 @@ inline const EnumExport alcEnumerations[]{ DECL(ALC_CONTEXT_FLAGS_EXT), DECL(ALC_CONTEXT_DEBUG_BIT_EXT), + DECL(ALC_PLAYBACK_DEVICE_SOFT), + DECL(ALC_CAPTURE_DEVICE_SOFT), + DECL(ALC_EVENT_TYPE_DEFAULT_DEVICE_CHANGED_SOFT), + DECL(ALC_EVENT_TYPE_DEVICE_ADDED_SOFT), + DECL(ALC_EVENT_TYPE_DEVICE_REMOVED_SOFT), + DECL(AL_INVALID), DECL(AL_NONE), diff --git a/alc/inprogext.h b/alc/inprogext.h index 739af517..fe2a1437 100644 --- a/alc/inprogext.h +++ b/alc/inprogext.h @@ -393,23 +393,6 @@ ALenum AL_APIENTRY EAXGetBufferModeDirect(ALCcontext *context, ALuint buffer, AL #endif #endif -#ifndef ALC_SOFT_system_events -#define ALC_SOFT_system_events -#define ALC_PLAYBACK_DEVICE_SOFT 0x19D4 -#define ALC_CAPTURE_DEVICE_SOFT 0x19D5 -#define ALC_EVENT_TYPE_DEFAULT_DEVICE_CHANGED_SOFT 0x19D6 -#define ALC_EVENT_TYPE_DEVICE_ADDED_SOFT 0x19D7 -#define ALC_EVENT_TYPE_DEVICE_REMOVED_SOFT 0x19D8 -typedef void (ALC_APIENTRY*ALCEVENTPROCTYPESOFT)(ALCenum eventType, ALCenum deviceType, - ALCdevice *device, ALCsizei length, const ALCchar *message, void *userParam) ALC_API_NOEXCEPT17; -typedef ALCboolean (ALC_APIENTRY*LPALCEVENTCONTROLSOFT)(ALCsizei count, const ALCenum *events, ALCboolean enable) ALC_API_NOEXCEPT17; -typedef void (ALC_APIENTRY*LPALCEVENTCALLBACKSOFT)(ALCEVENTPROCTYPESOFT callback, void *userParam) ALC_API_NOEXCEPT17; -#ifdef AL_ALEXT_PROTOTYPES -ALCboolean ALC_APIENTRY alcEventControlSOFT(ALCsizei count, const ALCenum *events, ALCboolean enable) ALC_API_NOEXCEPT; -void ALC_APIENTRY alcEventCallbackSOFT(ALCEVENTPROCTYPESOFT callback, void *userParam) ALC_API_NOEXCEPT; -#endif -#endif - /* Non-standard exports. Not part of any extension. */ AL_API const ALchar* AL_APIENTRY alsoft_get_version(void) noexcept; |