Store the listener directly in the context

1 files changed, 3 insertions, 5 deletions

diff --git a/Alc/alcontext.h b/Alc/alcontext.h
index 9ef2db3b..16a5e909 100644
--- a/Alc/alcontext.h
+++ b/Alc/alcontext.h
@@ -10,8 +10,9 @@
 #include "vector.h"
 #include "threads.h"
 
+#include "alListener.h"
+
 
-struct ALlistener;
 struct ALsource;
 struct ALeffectslot;
 struct ALcontextProps;
@@ -49,8 +50,6 @@ TYPEDEF_VECTOR(ALeffectslotPtr, vector_ALeffectslotPtr)
 struct ALCcontext_struct {
     RefCount ref;
 
-    ALlistener *Listener;
-
     vector_SourceSubList SourceList;
     ALuint NumSources;
     almtx_t SourceLock;
@@ -113,8 +112,7 @@ struct ALCcontext_struct {
 
     ATOMIC(ALCcontext*) next;
 
-    /* Memory space used by the listener (and possibly default effect slot) */
-    alignas(16) ALCbyte _listener_mem[];
+    ALlistener Listener;
 };
 
 ALCcontext *GetContextRef(void);