X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2Fopenal_wrapper.h;h=44fb7ecb62ba6e94db7939b70e88a9315822e8bf;hb=decb00e82a2e65e25dbcdd8f16fff5a6a07d31d6;hp=08ab1bea3969a76fd0be4efbb6d2a00fac49dea0;hpb=612415ff494c29cf2fc7ea560da9908eaff7d847;p=lugaru.git

diff --git a/Source/openal_wrapper.h b/Source/openal_wrapper.h
index 08ab1be..44fb7ec 100644
--- a/Source/openal_wrapper.h
+++ b/Source/openal_wrapper.h
@@ -1,8 +1,12 @@
 #ifndef OPENAL_WRAPPER_H
 #define OPENAL_WRAPPER_H
 
-#include "AL/al.h"
-#include "AL/alc.h"
+#ifdef _WIN32
+#include <malloc.h>
+#endif
+
+#include "al.h"
+#include "alc.h"
 
 #include "ogg/ogg.h"
 #include "vorbis/vorbisfile.h"
@@ -61,6 +65,9 @@ enum OPENAL_OUTPUTTYPES
 extern "C" {
 #endif
 
+#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, const float *vel);
 AL_API void OPENAL_3D_SetDopplerFactor(float scale);
@@ -81,7 +88,7 @@ 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 OPENAL_STREAM *OPENAL_Stream_Open(const char *name_or_data, unsigned int mode, int offset, int length);
-AL_API signed char OPENAL_Stream_Close(OPENAL_STREAM *stream);
+AL_API void OPENAL_Stream_Close(OPENAL_STREAM *stream);
 AL_API OPENAL_SAMPLE *OPENAL_Stream_GetSample(OPENAL_STREAM *stream);
 AL_API int OPENAL_Stream_PlayEx(int channel, OPENAL_STREAM *stream, OPENAL_DSPUNIT *dsp, signed char startpaused);
 AL_API signed char OPENAL_Stream_Stop(OPENAL_STREAM *stream);
@@ -97,8 +104,8 @@ AL_API signed char OPENAL_SetOutput(int outputtype);
 #  define OPENAL_Sample_LoadEx(a, b, c, d, e) OPENAL_Sample_Load( a, ConvertFileName( b), c, d, e)
 #  define OPENAL_Stream_OpenEx(a, b, c, d) OPENAL_Stream_Open(ConvertFileName(a), b, c, d)
 #elif !PLATFORM_MACOSX
-#  define OPENAL_Sample_LoadEx(a, b, c, d, e) FSOUND_Sample_Load( a, ConvertFileName( b), c, d, e)
-#  define OPENAL_Stream_OpenEx(a, b, c, d) FSOUND_Stream_Open(ConvertFileName(a), b, c, d)
+#  define OPENAL_Sample_LoadEx(a, b, c, d, e) OPENAL_Sample_Load( a, ConvertFileName( b), c, d, e)
+#  define OPENAL_Stream_OpenEx(a, b, c, d) OPENAL_Stream_Open(ConvertFileName(a), b, c, d)
 #endif
 
 #endif