Remove deprecated, performance, and error event types

These would be better served with a proper debug API, rather than a general
audio event API.

7 files changed, 5 insertions, 51 deletions

diff --git a/al/error.cpp b/al/error.cpp
index b667d14f..79bbc56c 100644
--- a/al/error.cpp
+++ b/al/error.cpp
@@ -38,8 +38,6 @@
 #include "alcontext.h"
 #include "alexcpt.h"
 #include "almalloc.h"
-#include "event.h"
-#include "inprogext.h"
 #include "logging.h"
 #include "opthelpers.h"
 #include "vector.h"
@@ -65,7 +63,6 @@ void ALCcontext::setError(ALenum errorCode, const char *msg, ...)
 
     if(msglen >= 0) msg = message.data();
     else msg = "<internal error constructing message>";
-    msglen = static_cast<int>(strlen(msg));
 
     WARN("Error generated on context %p, code 0x%04x, \"%s\"\n",
         decltype(std::declval<void*>()){this}, errorCode, msg);
@@ -82,14 +79,6 @@ void ALCcontext::setError(ALenum errorCode, const char *msg, ...)
 
     ALenum curerr{AL_NO_ERROR};
     mLastError.compare_exchange_strong(curerr, errorCode);
-    if((mEnabledEvts.load(std::memory_order_relaxed)&EventType_Error))
-    {
-        std::lock_guard<std::mutex> _{mEventCbLock};
-        ALbitfieldSOFT enabledevts{mEnabledEvts.load(std::memory_order_relaxed)};
-        if((enabledevts&EventType_Error) && mEventCb)
-            (*mEventCb)(AL_EVENT_TYPE_ERROR_SOFT, 0, static_cast<ALuint>(errorCode), msglen, msg,
-                mEventParam);
-    }
 }
 
 AL_API ALenum AL_APIENTRY alGetError(void)
diff --git a/al/event.cpp b/al/event.cpp
index cd8ea7c2..296c64e6 100644
--- a/al/event.cpp
+++ b/al/event.cpp
@@ -149,12 +149,6 @@ START_API_FUNC
                 flags |= EventType_BufferCompleted;
             else if(type == AL_EVENT_TYPE_SOURCE_STATE_CHANGED_SOFT)
                 flags |= EventType_SourceStateChange;
-            else if(type == AL_EVENT_TYPE_ERROR_SOFT)
-                flags |= EventType_Error;
-            else if(type == AL_EVENT_TYPE_PERFORMANCE_SOFT)
-                flags |= EventType_Performance;
-            else if(type == AL_EVENT_TYPE_DEPRECATED_SOFT)
-                flags |= EventType_Deprecated;
             else if(type == AL_EVENT_TYPE_DISCONNECTED_SOFT)
                 flags |= EventType_Disconnected;
             else
diff --git a/al/event.h b/al/event.h
index 44d9306f..71374618 100644
--- a/al/event.h
+++ b/al/event.h
@@ -16,10 +16,7 @@ enum {
     /* User event types. */
     EventType_SourceStateChange = 1<<0,
     EventType_BufferCompleted   = 1<<1,
-    EventType_Error             = 1<<2,
-    EventType_Performance       = 1<<3,
-    EventType_Deprecated        = 1<<4,
-    EventType_Disconnected      = 1<<5,
+    EventType_Disconnected      = 1<<2,
 
     /* Internal events. */
     EventType_ReleaseEffectState = 65536,
diff --git a/al/state.cpp b/al/state.cpp
index 8dda6f5f..dcc87972 100644
--- a/al/state.cpp
+++ b/al/state.cpp
@@ -736,20 +736,6 @@ START_API_FUNC
     ContextRef context{GetContextRef()};
     if UNLIKELY(!context) return;
 
-    if((context->mEnabledEvts.load(std::memory_order_relaxed)&EventType_Deprecated))
-    {
-        std::lock_guard<std::mutex> _{context->mEventCbLock};
-        ALbitfieldSOFT enabledevts{context->mEnabledEvts.load(std::memory_order_relaxed)};
-        if((enabledevts&EventType_Deprecated) && context->mEventCb)
-        {
-            static const char msg[] =
-                "alDopplerVelocity is deprecated in AL1.1, use alSpeedOfSound";
-            const ALsizei msglen{sizeof(msg)-1};
-            (*context->mEventCb)(AL_EVENT_TYPE_DEPRECATED_SOFT, 0, 0, msglen, msg,
-                context->mEventParam);
-        }
-    }
-
     if(!(value >= 0.0f && std::isfinite(value)))
         context->setError(AL_INVALID_VALUE, "Doppler velocity %f out of range", value);
     else
diff --git a/alc/alc.cpp b/alc/alc.cpp
index c72bc320..a870a565 100644
--- a/alc/alc.cpp
+++ b/alc/alc.cpp
@@ -794,9 +794,7 @@ constexpr struct {
     DECL(AL_EVENT_CALLBACK_USER_PARAM_SOFT),
     DECL(AL_EVENT_TYPE_BUFFER_COMPLETED_SOFT),
     DECL(AL_EVENT_TYPE_SOURCE_STATE_CHANGED_SOFT),
-    DECL(AL_EVENT_TYPE_ERROR_SOFT),
-    DECL(AL_EVENT_TYPE_PERFORMANCE_SOFT),
-    DECL(AL_EVENT_TYPE_DEPRECATED_SOFT),
+    DECL(AL_EVENT_TYPE_DISCONNECTED_SOFT),
 
     DECL(AL_DROP_UNMATCHED_SOFT),
     DECL(AL_REMIX_UNMATCHED_SOFT),
diff --git a/alc/inprogext.h b/alc/inprogext.h
index 0a7feef7..60717ab1 100644
--- a/alc/inprogext.h
+++ b/alc/inprogext.h
@@ -53,10 +53,7 @@ AL_API void AL_APIENTRY alFlushMappedBufferSOFT(ALuint buffer, ALsizei offset, A
 #define AL_EVENT_CALLBACK_USER_PARAM_SOFT        0x1221
 #define AL_EVENT_TYPE_BUFFER_COMPLETED_SOFT      0x1222
 #define AL_EVENT_TYPE_SOURCE_STATE_CHANGED_SOFT  0x1223
-#define AL_EVENT_TYPE_ERROR_SOFT                 0x1224
-#define AL_EVENT_TYPE_PERFORMANCE_SOFT           0x1225
-#define AL_EVENT_TYPE_DEPRECATED_SOFT            0x1226
-#define AL_EVENT_TYPE_DISCONNECTED_SOFT          0x1227
+#define AL_EVENT_TYPE_DISCONNECTED_SOFT          0x1224
 typedef void (AL_APIENTRY*ALEVENTPROCSOFT)(ALenum eventType, ALuint object, ALuint param,
                                            ALsizei length, const ALchar *message,
                                            void *userParam);
diff --git a/examples/alffplay.cpp b/examples/alffplay.cpp
index abffee85..6d6a2471 100644
--- a/examples/alffplay.cpp
+++ b/examples/alffplay.cpp
@@ -81,10 +81,7 @@ extern "C" {
 #define AL_EVENT_CALLBACK_USER_PARAM_SOFT        0x1221
 #define AL_EVENT_TYPE_BUFFER_COMPLETED_SOFT      0x1222
 #define AL_EVENT_TYPE_SOURCE_STATE_CHANGED_SOFT  0x1223
-#define AL_EVENT_TYPE_ERROR_SOFT                 0x1224
-#define AL_EVENT_TYPE_PERFORMANCE_SOFT           0x1225
-#define AL_EVENT_TYPE_DEPRECATED_SOFT            0x1226
-#define AL_EVENT_TYPE_DISCONNECTED_SOFT          0x1227
+#define AL_EVENT_TYPE_DISCONNECTED_SOFT          0x1224
 typedef void (AL_APIENTRY*ALEVENTPROCSOFT)(ALenum eventType, ALuint object, ALuint param,
                                            ALsizei length, const ALchar *message,
                                            void *userParam);
@@ -904,9 +901,6 @@ void AL_APIENTRY AudioState::EventCallback(ALenum eventType, ALuint object, ALui
     {
     case AL_EVENT_TYPE_BUFFER_COMPLETED_SOFT: std::cout<< "Buffer completed"; break;
     case AL_EVENT_TYPE_SOURCE_STATE_CHANGED_SOFT: std::cout<< "Source state changed"; break;
-    case AL_EVENT_TYPE_ERROR_SOFT: std::cout<< "API error"; break;
-    case AL_EVENT_TYPE_PERFORMANCE_SOFT: std::cout<< "Performance"; break;
-    case AL_EVENT_TYPE_DEPRECATED_SOFT: std::cout<< "Deprecated"; break;
     case AL_EVENT_TYPE_DISCONNECTED_SOFT: std::cout<< "Disconnected"; break;
     default:
         std::cout<< "0x"<<std::hex<<std::setw(4)<<std::setfill('0')<<eventType<<std::dec<<
@@ -964,9 +958,8 @@ int AudioState::handler()
     ALenum fmt;
 
 #ifdef AL_SOFT_events
-    const std::array<ALenum,6> evt_types{{
+    const std::array<ALenum,3> evt_types{{
         AL_EVENT_TYPE_BUFFER_COMPLETED_SOFT, AL_EVENT_TYPE_SOURCE_STATE_CHANGED_SOFT,
-        AL_EVENT_TYPE_ERROR_SOFT, AL_EVENT_TYPE_PERFORMANCE_SOFT, AL_EVENT_TYPE_DEPRECATED_SOFT,
         AL_EVENT_TYPE_DISCONNECTED_SOFT}};
     if(alEventControlSOFT)
     {