Merge branch 'linux-efx' into linux

Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp

@@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsTypes.h"
 #include "hsThread.h"
 #ifndef EAX_SDK_AVAILABLE
-#include <EFX-Util.h>
+#include "plEAXStructures.h"
 #endif
 #include "plEAXEffects.h"
 #include "plAudioCore/plAudioCore.h"

Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.h

@@ -62,7 +62,11 @@ class plEAXListenerMod;
 #ifdef EAX_SDK_AVAILABLE
 typedef struct _EAXREVERBPROPERTIES EAXREVERBPROPERTIES;
 #else
-#include <EFX-Util.h>
+#include "plEAXStructures.h"
+#endif
+
+#if !HS_BUILD_FOR_WIN32
+#define GUID char*
 #endif
 
 class plEAXListener 

Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.cpp

@@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //////////////////////////////////////////////////////////////////////////////
 
 #ifndef EAX_SDK_AVAILABLE
-#include <EFX-Util.h>
+#include "plEAXStructures.h"
 #endif
 #include "hsTypes.h"
 #include "plEAXListenerMod.h"

Sources/Plasma/PubUtilLib/plAudio/plEAXStructures.h

@@ -0,0 +1,80 @@
+/*==LICENSE==*
+
+CyanWorlds.com Engine - MMOG client, server and tools
+Copyright (C) 2011  Cyan Worlds, Inc.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Additional permissions under GNU GPL version 3 section 7
+
+If you modify this Program, or any covered work, by linking or
+combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
+NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
+JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
+(or a modified version of those libraries),
+containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
+PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
+JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
+licensors of this Program grant you additional
+permission to convey the resulting work. Corresponding Source for a
+non-source form of such a combination shall include the source code for
+the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
+work.
+
+You can contact Cyan Worlds, Inc. by email legal@cyan.com
+ or by snail mail at:
+      Cyan Worlds, Inc.
+      14617 N Newport Hwy
+      Mead, WA   99021
+
+*==LICENSE==*/
+
+#ifndef plEAXStructures_h_inc
+#define plEAXStructures_h_inc
+
+typedef struct _EAXVECTOR {
+        float x;
+        float y;
+        float z;
+} EAXVECTOR;
+
+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 //plEAXStructures_h_inc