Move the vector and matrix declarations to a separate header

2 files changed, 10 insertions, 52 deletions

diff --git a/OpenAL32/Include/alListener.h b/OpenAL32/Include/alListener.h
index 33dea4f3..ec6ee509 100644
--- a/OpenAL32/Include/alListener.h
+++ b/OpenAL32/Include/alListener.h
@@ -1,12 +1,13 @@
 #ifndef _AL_LISTENER_H_
 #define _AL_LISTENER_H_
 
-#include "alMain.h"
-#include "alu.h"
+#include "AL/alc.h"
+#include "AL/al.h"
+#include "AL/alext.h"
+
+#include "atomic.h"
+#include "vecmat.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 struct ALlistenerProps {
     ALfloat Position[3];
@@ -15,10 +16,10 @@ struct ALlistenerProps {
     ALfloat Up[3];
     ALfloat Gain;
 
-    ATOMIC(struct ALlistenerProps*) next;
+    ATOMIC(ALlistenerProps*) next;
 };
 
-typedef struct ALlistener {
+struct ALlistener {
     alignas(16) ALfloat Position[3];
     ALfloat Velocity[3];
     ALfloat Forward[3];
@@ -29,7 +30,7 @@ typedef struct ALlistener {
 
     /* Pointer to the most recent property values that are awaiting an update.
      */
-    ATOMIC(struct ALlistenerProps*) Update;
+    ATOMIC(ALlistenerProps*) Update;
 
     struct {
         aluMatrixf Matrix;
@@ -45,12 +46,8 @@ typedef struct ALlistener {
         ALboolean SourceDistanceModel;
         enum DistanceModel DistanceModel;
     } Params;
-} ALlistener;
+};
 
 void UpdateListenerProps(ALCcontext *context);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h
index 7031df70..d309c2a7 100644
--- a/OpenAL32/Include/alu.h
+++ b/OpenAL32/Include/alu.h
@@ -98,45 +98,6 @@ extern const struct BSincTable bsinc12;
 extern const struct BSincTable bsinc24;
 
 
-typedef union aluVector {
-    alignas(16) ALfloat v[4];
-} aluVector;
-
-inline void aluVectorSet(aluVector *vector, ALfloat x, ALfloat y, ALfloat z, ALfloat w)
-{
-    vector->v[0] = x;
-    vector->v[1] = y;
-    vector->v[2] = z;
-    vector->v[3] = w;
-}
-
-
-typedef union aluMatrixf {
-    alignas(16) ALfloat m[4][4];
-} aluMatrixf;
-extern const aluMatrixf IdentityMatrixf;
-
-inline void aluMatrixfSetRow(aluMatrixf *matrix, ALuint row,
-                             ALfloat m0, ALfloat m1, ALfloat m2, ALfloat m3)
-{
-    matrix->m[row][0] = m0;
-    matrix->m[row][1] = m1;
-    matrix->m[row][2] = m2;
-    matrix->m[row][3] = m3;
-}
-
-inline void aluMatrixfSet(aluMatrixf *matrix, ALfloat m00, ALfloat m01, ALfloat m02, ALfloat m03,
-                                              ALfloat m10, ALfloat m11, ALfloat m12, ALfloat m13,
-                                              ALfloat m20, ALfloat m21, ALfloat m22, ALfloat m23,
-                                              ALfloat m30, ALfloat m31, ALfloat m32, ALfloat m33)
-{
-    aluMatrixfSetRow(matrix, 0, m00, m01, m02, m03);
-    aluMatrixfSetRow(matrix, 1, m10, m11, m12, m13);
-    aluMatrixfSetRow(matrix, 2, m20, m21, m22, m23);
-    aluMatrixfSetRow(matrix, 3, m30, m31, m32, m33);
-}
-
-
 enum {
     AF_None = 0,
     AF_LowPass = 1,