X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FAudio%2Fopenal_wrapper.hpp;h=d1220309c64cab9405a9e9816e8e0b49be37c8a1;hb=80262de6f860d9aead05ffa42bdb245c0c888b37;hp=cea479711f1fd1f3d51e317821a1c62ddee58eef;hpb=ed3662c0852c4312a612b4fc35bd03aba8d13db7;p=lugaru.git

diff --git a/Source/Audio/openal_wrapper.hpp b/Source/Audio/openal_wrapper.hpp
index cea4797..d122030 100644
--- a/Source/Audio/openal_wrapper.hpp
+++ b/Source/Audio/openal_wrapper.hpp
@@ -22,10 +22,16 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #define _OPENAL_WRAPPER_HPP_
 
 #include "MacCompatibility.hpp"
-#include "Math/Quaternions.hpp"
+#include "Math/XYZ.hpp"
+
+#ifdef __APPLE__
+  #include <OpenAL/al.h>
+  #include <OpenAL/alc.h>
+#else
+  #include <AL/al.h>
+  #include <AL/alc.h>
+#endif
 
-#include <AL/al.h>
-#include <AL/alc.h>
 #include <ogg/ogg.h>
 #include <vorbis/vorbisfile.h>
 
@@ -67,12 +73,6 @@ typedef struct OPENAL_SAMPLE    OPENAL_SAMPLE;
 typedef OPENAL_SAMPLE    OPENAL_STREAM;
 typedef struct OPENAL_DSPUNIT   OPENAL_DSPUNIT;
 
-enum OPENAL_OUTPUTTYPES {
-    OPENAL_OUTPUT_NOSOUND,    /* NoSound driver, all calls to this succeed but do nothing. */
-    OPENAL_OUTPUT_OSS,        /* Linux/Unix OSS (Open Sound System) driver, i.e. the kernel sound drivers. */
-    OPENAL_OUTPUT_ALSA,       /* Linux Alsa driver. */
-};
-
 #define OPENAL_LOOP_OFF      0x00000001  /* For non looping samples. */
 #define OPENAL_LOOP_NORMAL   0x00000002  /* For forward looping samples. */
 #define OPENAL_HW3D          0x00001000  /* Attempts to make samples use 3d hardware acceleration. (if the card supports it) */
@@ -88,8 +88,8 @@ extern "C" {
 #define AL_API
 
     AL_API void OPENAL_3D_Listener_SetAttributes(const float *pos, const float *vel, float fx, float fy, float fz, float tx, float ty, float tz);
-    AL_API signed char OPENAL_3D_SetAttributes(int channel, const float *pos, const float *vel);
-    AL_API signed char OPENAL_3D_SetAttributes_(int channel, const XYZ &pos, const float *vel);
+    AL_API signed char OPENAL_3D_SetAttributes(int channel, const float *pos);
+    AL_API signed char OPENAL_3D_SetAttributes_(int channel, const XYZ &pos);
     AL_API signed char OPENAL_Init(int mixrate, int maxsoftwarechannels, unsigned int flags);
     AL_API void OPENAL_Close();
     AL_API OPENAL_SAMPLE *OPENAL_Sample_Load(int index, const char *name_or_data, unsigned int mode, int offset, int length);
@@ -101,7 +101,6 @@ extern "C" {
     AL_API signed char OPENAL_StopSound(int channel);
     AL_API signed char OPENAL_Stream_SetMode(OPENAL_STREAM *stream, unsigned int mode);
     AL_API void OPENAL_Update();
-    AL_API signed char OPENAL_SetOutput(int outputtype);
     void PlaySoundEx(int chan, OPENAL_SAMPLE *sptr, OPENAL_DSPUNIT *dsp, signed char startpaused);
     void PlayStreamEx(int chan, OPENAL_SAMPLE *sptr, OPENAL_DSPUNIT *dsp, signed char startpaused);