X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FAudio%2Fopenal_wrapper.hpp;h=e4175972a016a9c5d8c677036e7106ff6fb32829;hb=0aab437dc560d2afa982e61cc2547756ad7b0761;hp=300bec261ece531fcc89d0f9864c6db221ac2aeb;hpb=90a133faa774ea0ef7dfff16efbe83b57bccf122;p=lugaru.git

diff --git a/Source/Audio/openal_wrapper.hpp b/Source/Audio/openal_wrapper.hpp
index 300bec2..e417597 100644
--- a/Source/Audio/openal_wrapper.hpp
+++ b/Source/Audio/openal_wrapper.hpp
@@ -1,6 +1,6 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
-Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
+Copyright (C) 2010-2017 - Lugaru contributors (see AUTHORS file)
 
 This file is part of Lugaru.
 
@@ -21,8 +21,8 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef _OPENAL_WRAPPER_HPP_
 #define _OPENAL_WRAPPER_HPP_
 
-#include "MacCompatibility.hpp"
-#include "Math/Quaternions.hpp"
+#include "Math/XYZ.hpp"
+#include "Platform/Platform.hpp"
 
 #ifdef __APPLE__
   #include <OpenAL/al.h>
@@ -73,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) */
@@ -94,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);
@@ -107,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);