X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FAudio%2Fopenal_wrapper.hpp;h=99c4c2fa7f6c8d250fe8a128fc07bb48207c6235;hb=6f9609cebe4bcb87a7722b628b02a1975c56148c;hp=2e7b7aff68a47810d6431302140a68107ea49f40;hpb=72217fbefd03881048287da8345925e1b89b5b9b;p=lugaru.git

diff --git a/Source/Audio/openal_wrapper.hpp b/Source/Audio/openal_wrapper.hpp
index 2e7b7af..99c4c2f 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.
 
@@ -25,14 +25,13 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #include "Platform/Platform.hpp"
 
 #ifdef __APPLE__
-  #include <OpenAL/al.h>
-  #include <OpenAL/alc.h>
+#include <OpenAL/al.h>
+#include <OpenAL/alc.h>
 #else
-  #include <AL/al.h>
-  #include <AL/alc.h>
+#include <AL/al.h>
+#include <AL/alc.h>
 #endif
 
-#include <ogg/ogg.h>
 #include <vorbis/vorbisfile.h>
 
 #ifdef _WIN32
@@ -68,17 +67,16 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #endif /* DLL_EXPORTS */
 #endif /* if 0 */
 
+typedef struct OPENAL_SAMPLE OPENAL_SAMPLE;
+typedef OPENAL_SAMPLE OPENAL_STREAM;
+typedef struct OPENAL_DSPUNIT OPENAL_DSPUNIT;
 
-typedef struct OPENAL_SAMPLE    OPENAL_SAMPLE;
-typedef OPENAL_SAMPLE    OPENAL_STREAM;
-typedef struct OPENAL_DSPUNIT   OPENAL_DSPUNIT;
-
-#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) */
-#define OPENAL_2D            0x00002000  /* Tells software (not hardware) based sample not to be included in 3d processing. */
-#define OPENAL_FREE             -1      /* value to play on any free channel, or to allocate a sample in a free sample slot. */
-#define OPENAL_ALL              -3      /* for a channel index , this flag will affect ALL channels available!  Not supported by every function. */
+#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) */
+#define OPENAL_2D 0x00002000          /* Tells software (not hardware) based sample not to be included in 3d processing. */
+#define OPENAL_FREE -1                /* value to play on any free channel, or to allocate a sample in a free sample slot. */
+#define OPENAL_ALL -3                 /* for a channel index , this flag will affect ALL channels available!  Not supported by every function. */
 
 #ifdef __cplusplus
 extern "C" {
@@ -87,22 +85,22 @@ extern "C" {
 #undef AL_API
 #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);
-    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);
-    AL_API void OPENAL_Sample_Free(OPENAL_SAMPLE *sptr);
-    AL_API signed char OPENAL_SetFrequency(int channel, bool slomo = false);
-    AL_API signed char OPENAL_SetVolume(int channel, int vol);
-    AL_API signed char OPENAL_SetPaused(int channel, signed char paused);
-    AL_API void OPENAL_SetSFXMasterVolume(int volume);
-    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();
-    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);
+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);
+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);
+AL_API void OPENAL_Sample_Free(OPENAL_SAMPLE* sptr);
+AL_API signed char OPENAL_SetFrequency(int channel, bool slomo = false);
+AL_API signed char OPENAL_SetVolume(int channel, int vol);
+AL_API signed char OPENAL_SetPaused(int channel, signed char paused);
+AL_API void OPENAL_SetSFXMasterVolume(int volume);
+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();
+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);
 
 #ifdef __cplusplus
 }