Merge pull request #284 from dgelessus/make_pleaxlistenermod_h_includ…

…able

Fix plEAXListenerMod.h to be includable from outside libHSPlasma itself

Python/PRP/Audio/pyEAXListenerMod.cpp

@@ -19,6 +19,7 @@
 #include <PRP/Audio/plEAXListenerMod.h>
 #include "PRP/Modifier/pyModifier.h"
 #include "PRP/KeyedObject/pyKey.h"
+#include <3rdPartyLibs/AL/EFX-Util.h>
 #include <3rdPartyLibs/AL/efx-unofficial.h>
 
 PY_PLASMA_NEW(EAXListenerMod, plEAXListenerMod)

core/CMakeLists.txt

@@ -98,6 +98,7 @@ set(PRP_AUDIO_HEADERS
     PRP/Audio/plDirectMusicSound.h
     PRP/Audio/plEAXEffects.h
     PRP/Audio/plEAXListenerMod.h
+    PRP/Audio/plEAXStructures.h
     PRP/Audio/plSound.h
     PRP/Audio/plSoundBuffer.h
     PRP/Audio/plWin32Sound.h

core/PRP/Audio/plEAXListenerMod.h

@@ -17,9 +17,9 @@
 #ifndef _PLEAXLISTENERMOD_H
 #define _PLEAXLISTENERMOD_H
 
+#include "plEAXStructures.h"
 #include "PRP/Modifier/plModifier.h"
 #include "Math/hsGeometry3.h"
-#include "3rdPartyLibs/AL/EFX-Util.h"
 
 class HSPLASMA_EXPORT plEAXListenerMod : public plSingleModifier
 {

core/PRP/Audio/plEAXStructures.h

@@ -0,0 +1,43 @@
+// Subset of 3rdPartyLibs/AL/EFX-Util.h containing only the structures
+// used in the public API of plEAXListenerMod.
+
+#ifndef EAXVECTOR_DEFINED
+#define EAXVECTOR_DEFINED
+typedef struct _EAXVECTOR
+{
+    float x;
+    float y;
+    float z;
+} EAXVECTOR;
+#endif
+
+#ifndef EAXREVERBPROPERTIES_DEFINED
+#define EAXREVERBPROPERTIES_DEFINED
+typedef struct _EAXREVERBPROPERTIES
+{
+    unsigned long ulEnvironment;
+    float flEnvironmentSize;
+    float flEnvironmentDiffusion;
+    long lRoom;
+    long lRoomHF;
+    long lRoomLF;
+    float flDecayTime;
+    float flDecayHFRatio;
+    float flDecayLFRatio;
+    long lReflections;
+    float flReflectionsDelay;
+    EAXVECTOR vReflectionsPan;
+    long lReverb;
+    float flReverbDelay;
+    EAXVECTOR vReverbPan;
+    float flEchoTime;
+    float flEchoDepth;
+    float flModulationTime;
+    float flModulationDepth;
+    float flAirAbsorptionHF;
+    float flHFReference;
+    float flLFReference;
+    float flRoomRolloffFactor;
+    unsigned long ulFlags;
+} EAXREVERBPROPERTIES, *LPEAXREVERBPROPERTIES;
+#endif