X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2Fopenal_wrapper.h;h=99fad2cea8eaa4d4f7b1512f8c91fceef8bd4736;hb=85f9eeb8f438d6d542c0c7b7446b31585cc9c23d;hp=f31c6c081277da807afc713ab0b9db4080c62e43;hpb=0acdb5e7e90ddd677a5e72cc97731dad12edf230;p=lugaru.git

diff --git a/Source/openal_wrapper.h b/Source/openal_wrapper.h
index f31c6c0..99fad2c 100644
--- a/Source/openal_wrapper.h
+++ b/Source/openal_wrapper.h
@@ -5,8 +5,8 @@
 #include <malloc.h>
 #endif
 
-#include "AL/al.h"
-#include "AL/alc.h"
+#include "al.h"
+#include "alc.h"
 
 #include "ogg/ogg.h"
 #include "vorbis/vorbisfile.h"
@@ -44,7 +44,7 @@
 
 
 typedef struct OPENAL_SAMPLE    OPENAL_SAMPLE;
-typedef struct OPENAL_STREAM    OPENAL_STREAM;
+typedef OPENAL_SAMPLE    OPENAL_STREAM;
 typedef struct OPENAL_DSPUNIT   OPENAL_DSPUNIT;
 
 enum OPENAL_OUTPUTTYPES
@@ -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);
@@ -78,14 +81,12 @@ AL_API int OPENAL_PlaySoundEx(int channel, OPENAL_SAMPLE *sptr, OPENAL_DSPUNIT *
 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_Sample_SetMode(OPENAL_SAMPLE *sptr, unsigned int mode);
-AL_API signed char OPENAL_Sample_SetMinMaxDistance(OPENAL_SAMPLE *sptr, float mindist, float maxdist);
 AL_API signed char OPENAL_SetFrequency(int channel, int freq);
 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 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 +98,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) 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)
-#endif
-
 #endif