Use a std::thread for the event thread

2 files changed, 26 insertions, 4 deletions

diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index e31d0146..a81d3f3d 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -803,7 +803,8 @@ inline void LockFilterList(ALCdevice *device) { almtx_lock(&device->FilterLock);
 inline void UnlockFilterList(ALCdevice *device) { almtx_unlock(&device->FilterLock); }
 
 
-int EventThread(void *arg);
+void StartEventThrd(ALCcontext *ctx);
+void StopEventThrd(ALCcontext *ctx);
 
 char *alstrdup(const char *str);
 
diff --git a/OpenAL32/event.cpp b/OpenAL32/event.cpp
index 67a10645..e4b5eee0 100644
--- a/OpenAL32/event.cpp
+++ b/OpenAL32/event.cpp
@@ -15,10 +15,8 @@
 #include "threads.h"
 
 
-int EventThread(void *arg)
+static int EventThread(ALCcontext *context)
 {
-    auto context = static_cast<ALCcontext*>(arg);
-
     bool quitnow{false};
     while(LIKELY(!quitnow))
     {
@@ -50,6 +48,29 @@ int EventThread(void *arg)
     return 0;
 }
 
+void StartEventThrd(ALCcontext *ctx)
+{
+    try {
+        ctx->EventThread = std::thread(EventThread, ctx);
+    }
+    catch(std::exception& e) {
+        ERR("Failed to start event thread: %s\n", e.what());
+    }
+    catch(...) {
+        ERR("Failed to start event thread! Expect problems.\n");
+    }
+}
+
+void StopEventThrd(ALCcontext *ctx)
+{
+    static constexpr AsyncEvent kill_evt = ASYNC_EVENT(EventType_KillThread);
+    while(ll_ringbuffer_write(ctx->AsyncEvents, (const char*)&kill_evt, 1) == 0)
+        althrd_yield();
+    alsem_post(&ctx->EventSem);
+    if(ctx->EventThread.joinable())
+        ctx->EventThread.join();
+}
+
 AL_API void AL_APIENTRY alEventControlSOFT(ALsizei count, const ALenum *types, ALboolean enable)
 {
     ContextRef context{GetContextRef()};