X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2Fopenal_wrapper.h;h=9f1a590b2b401d3fe2e59c7efebbc095d09d9c19;hb=f05936225ef7696c93f6d831f7d7abf94a4a2554;hp=e1ca95d5da5e1639db57c9ba4276fdee06ce1351;hpb=5b4ceabfe80faa2fe0d231ad24b76a704582b3bd;p=lugaru.git

diff --git a/Source/openal_wrapper.h b/Source/openal_wrapper.h
index e1ca95d..9f1a590 100644
--- a/Source/openal_wrapper.h
+++ b/Source/openal_wrapper.h
@@ -65,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);
@@ -85,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,12 +100,4 @@ AL_API signed char OPENAL_SetOutput(int outputtype);
 }
 #endif
 
-#if USE_OPENAL
-#  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) 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