X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2Fopenal_wrapper.cpp;h=589901276b6b541aa1ccf6581078a3de257befbd;hb=24004d6ab1e68faaf85ece11b566449997da5013;hp=5e832fb5bc6959099b292cc2eea29e4aeb22184b;hpb=1eec4500c708d0619abf36759454f59fa175cacf;p=lugaru.git diff --git a/Source/openal_wrapper.cpp b/Source/openal_wrapper.cpp index 5e832fb..5899012 100644 --- a/Source/openal_wrapper.cpp +++ b/Source/openal_wrapper.cpp @@ -10,7 +10,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -55,10 +55,9 @@ static bool lookup_alsym(const char *funcname, void **func, const char *libname) return false; *func = dlsym(aldlhandle, funcname); - if (*func == NULL) - { + if (*func == NULL) { fprintf(stderr, "Failed to find OpenAL symbol \"%s\" in \"%s\"\n", - funcname, libname); + funcname, libname); return false; } return true; @@ -66,11 +65,10 @@ static bool lookup_alsym(const char *funcname, void **func, const char *libname) static void unload_alsyms(void) { - #define AL_FUNC(t,ret,fn,params,call,rt) p##fn = NULL; - #include "alstubs.h" - #undef AL_FUNC - if (aldlhandle) - { +#define AL_FUNC(t,ret,fn,params,call,rt) p##fn = NULL; +#include "alstubs.h" +#undef AL_FUNC + if (aldlhandle) { dlclose(aldlhandle); aldlhandle = NULL; } @@ -78,17 +76,16 @@ static void unload_alsyms(void) static bool lookup_all_alsyms(const char *libname) { - if (!aldlhandle) - { + if (!aldlhandle) { if ( (aldlhandle = dlopen(libname, RTLD_GLOBAL | RTLD_NOW)) == NULL ) return false; } bool retval = true; - #define AL_FUNC(t,ret,fn,params,call,rt) \ +#define AL_FUNC(t,ret,fn,params,call,rt) \ if (!lookup_alsym(#fn, (void **) &p##fn, libname)) retval = false; - #include "alstubs.h" - #undef AL_FUNC +#include "alstubs.h" +#undef AL_FUNC if (!retval) unload_alsyms(); @@ -100,16 +97,14 @@ static bool lookup_all_alsyms(const char *libname) #define unload_alsyms() #endif -typedef struct -{ +typedef struct { ALuint sid; OPENAL_SAMPLE *sample; bool startpaused; float position[3]; } OPENAL_Channels; -typedef struct OPENAL_SAMPLE -{ +typedef struct OPENAL_SAMPLE { char *name; ALuint bid; // buffer id. int mode; @@ -137,13 +132,10 @@ static void set_channel_position(const int channel, const float x, const ALuint sid = chan->sid; const bool no_attenuate = sptr->is2d; - if (no_attenuate) - { + if (no_attenuate) { alSourcei(sid, AL_SOURCE_RELATIVE, AL_TRUE); alSource3f(sid, AL_POSITION, 0.0f, 0.0f, 0.0f); - } - else - { + } else { alSourcei(sid, AL_SOURCE_RELATIVE, AL_FALSE); alSource3f(sid, AL_POSITION, x, y, z); } @@ -153,8 +145,7 @@ static void set_channel_position(const int channel, const float x, 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) { if (!initialized) return; - if (pos != NULL) - { + if (pos != NULL) { alListener3f(AL_POSITION, pos[0], pos[1], -pos[2]); listener_position[0] = pos[0]; listener_position[1] = pos[1]; @@ -167,8 +158,7 @@ AL_API void OPENAL_3D_Listener_SetAttributes(const float *pos, const float *vel, // we ignore velocity, since doppler's broken in the Linux AL at the moment... // adjust existing positions... - for (int i = 0; i < num_channels; i++) - { + for (int i = 0; i < num_channels; i++) { const float *p = impl_channels[i].position; set_channel_position(i, p[0], p[1], p[2]); } @@ -205,10 +195,8 @@ AL_API signed char OPENAL_Init(int mixrate, int maxsoftwarechannels, unsigned in if (flags != 0) // unsupported. return false; - if (!lookup_all_alsyms("./openal.so")) // !!! FIXME: linux specific lib name - { - if (!lookup_all_alsyms("openal.so.1")) // !!! FIXME: linux specific lib name - { + if (!lookup_all_alsyms("./openal.so")) { // !!! FIXME: linux specific lib name + if (!lookup_all_alsyms("openal.so.1")) { // !!! FIXME: linux specific lib name if (!lookup_all_alsyms("openal.so")) // !!! FIXME: linux specific lib name return false; } @@ -220,8 +208,7 @@ AL_API signed char OPENAL_Init(int mixrate, int maxsoftwarechannels, unsigned in ALint caps[] = { ALC_FREQUENCY, mixrate, 0 }; ALCcontext *ctx = alcCreateContext(dev, caps); - if (!ctx) - { + if (!ctx) { alcCloseDevice(dev); return false; } @@ -229,9 +216,8 @@ AL_API signed char OPENAL_Init(int mixrate, int maxsoftwarechannels, unsigned in alcMakeContextCurrent(ctx); alcProcessContext(ctx); - bool cmdline(const char *cmd); - if (cmdline("openalinfo")) - { + bool cmdline(const char * cmd); + if (cmdline("openalinfo")) { printf("AL_VENDOR: %s\n", (char *) alGetString(AL_VENDOR)); printf("AL_RENDERER: %s\n", (char *) alGetString(AL_RENDERER)); printf("AL_VERSION: %s\n", (char *) alGetString(AL_VERSION)); @@ -253,10 +239,8 @@ AL_API void OPENAL_Close() if (!initialized) return; ALCcontext *ctx = alcGetCurrentContext(); - if (ctx) - { - for (int i = 0; i < num_channels; i++) - { + if (ctx) { + for (int i = 0; i < num_channels; i++) { alSourceStop(impl_channels[i].sid); alSourcei(impl_channels[i].sid, AL_BUFFER, 0); alDeleteSources(1, &impl_channels[i].sid); @@ -320,14 +304,11 @@ static int OPENAL_PlaySoundEx(int channel, OPENAL_SAMPLE *sptr, OPENAL_DSPUNIT * if (!initialized) return -1; if (sptr == NULL) return -1; if (dsp != NULL) return -1; - if (channel == OPENAL_FREE) - { - for (int i = 0; i < num_channels; i++) - { + if (channel == OPENAL_FREE) { + for (int i = 0; i < num_channels; i++) { ALint state = 0; alGetSourceiv(impl_channels[i].sid, AL_SOURCE_STATE, &state); - if ((state != AL_PLAYING) && (state != AL_PAUSED)) - { + if ((state != AL_PLAYING) && (state != AL_PAUSED)) { channel = i; break; } @@ -364,17 +345,16 @@ static void *decode_to_pcm(const char *_fname, ALenum &format, ALsizei &size, AL strcat(fname, ".ogg"); // just in case... - #undef fopen +#undef fopen FILE *io = fopen(fname, "rb"); if (io == NULL) return NULL; ALubyte *retval = NULL; - #if 0 // untested, so disable this! +#if 0 // untested, so disable this! // Can we just feed it to the AL compressed? - if (alIsExtensionPresent((const ALubyte *) "AL_EXT_vorbis")) - { + if (alIsExtensionPresent((const ALubyte *) "AL_EXT_vorbis")) { format = alGetEnumValue((const ALubyte *) "AL_FORMAT_VORBIS_EXT"); freq = 44100; fseek(io, 0, SEEK_END); @@ -383,28 +363,25 @@ static void *decode_to_pcm(const char *_fname, ALenum &format, ALsizei &size, AL retval = (ALubyte *) malloc(size); size_t rc = fread(retval, size, 1, io); fclose(io); - if (rc != 1) - { + if (rc != 1) { free(retval); return NULL; } return retval; } - #endif +#endif // Uncompress and feed to the AL. OggVorbis_File vf; memset(&vf, '\0', sizeof (vf)); - if (ov_open(io, &vf, NULL, 0) == 0) - { + if (ov_open(io, &vf, NULL, 0) == 0) { int bitstream = 0; vorbis_info *info = ov_info(&vf, -1); size = 0; format = (info->channels == 1) ? AL_FORMAT_MONO16 : AL_FORMAT_STEREO16; freq = info->rate; - if ((info->channels != 1) && (info->channels != 2)) - { + if ((info->channels != 1) && (info->channels != 2)) { ov_clear(&vf); return NULL; } @@ -413,17 +390,13 @@ static void *decode_to_pcm(const char *_fname, ALenum &format, ALsizei &size, AL long rc = 0; size_t allocated = 64 * 1024; retval = (ALubyte *) malloc(allocated); - while ( (rc = ov_read(&vf, buf, sizeof (buf), bigendian, 2, 1, &bitstream)) != 0 ) - { - if (rc > 0) - { + while ( (rc = ov_read(&vf, buf, sizeof (buf), bigendian, 2, 1, &bitstream)) != 0 ) { + if (rc > 0) { size += rc; - if (size >= allocated) - { + if (size >= allocated) { allocated *= 2; ALubyte *tmp = (ALubyte *) realloc(retval, allocated); - if (tmp == NULL) - { + if (tmp == NULL) { free(retval); retval = NULL; break; @@ -462,8 +435,7 @@ AL_API OPENAL_SAMPLE *OPENAL_Sample_Load(int index, const char *name_or_data, un ALuint bid = 0; alGetError(); alGenBuffers(1, &bid); - if (alGetError() == AL_NO_ERROR) - { + if (alGetError() == AL_NO_ERROR) { alBufferData(bid, format, data, size, frequency); retval = new OPENAL_SAMPLE; retval->bid = bid; @@ -481,12 +453,9 @@ AL_API OPENAL_SAMPLE *OPENAL_Sample_Load(int index, const char *name_or_data, un AL_API void OPENAL_Sample_Free(OPENAL_SAMPLE *sptr) { if (!initialized) return; - if (sptr) - { - for (int i = 0; i < num_channels; i++) - { - if (impl_channels[i].sample == sptr) - { + if (sptr) { + for (int i = 0; i < num_channels; i++) { + if (impl_channels[i].sample == sptr) { alSourceStop(impl_channels[i].sid); alSourcei(impl_channels[i].sid, AL_BUFFER, 0); impl_channels[i].sample = NULL; @@ -510,8 +479,7 @@ static signed char OPENAL_Sample_SetMode(OPENAL_SAMPLE *sptr, unsigned int mode) AL_API signed char OPENAL_SetFrequency(int channel, int freq) { if (!initialized) return false; - if (channel == OPENAL_ALL) - { + if (channel == OPENAL_ALL) { for (int i = 0; i < num_channels; i++) OPENAL_SetFrequency(i, freq); return true; @@ -529,8 +497,7 @@ AL_API signed char OPENAL_SetVolume(int channel, int vol) { if (!initialized) return false; - if (channel == OPENAL_ALL) - { + if (channel == OPENAL_ALL) { for (int i = 0; i < num_channels; i++) OPENAL_SetVolume(i, vol); return true; @@ -549,8 +516,7 @@ AL_API signed char OPENAL_SetPaused(int channel, signed char paused) { if (!initialized) return false; - if (channel == OPENAL_ALL) - { + if (channel == OPENAL_ALL) { for (int i = 0; i < num_channels; i++) OPENAL_SetPaused(i, paused); return true; @@ -566,8 +532,7 @@ AL_API signed char OPENAL_SetPaused(int channel, signed char paused) if ((paused) && (state == AL_PLAYING)) alSourcePause(impl_channels[channel].sid); - else if ((!paused) && (state == AL_PAUSED)) - { + else if ((!paused) && (state == AL_PAUSED)) { alSourcePlay(impl_channels[channel].sid); impl_channels[channel].startpaused = false; } @@ -585,8 +550,7 @@ AL_API signed char OPENAL_StopSound(int channel) { if (!initialized) return false; - if (channel == OPENAL_ALL) - { + if (channel == OPENAL_ALL) { for (int i = 0; i < num_channels; i++) OPENAL_StopSound(i); return true; @@ -617,10 +581,8 @@ static int OPENAL_Stream_PlayEx(int channel, OPENAL_STREAM *stream, OPENAL_DSPUN static signed char OPENAL_Stream_Stop(OPENAL_STREAM *stream) { if (!initialized) return false; - for (int i = 0; i < num_channels; i++) - { - if (impl_channels[i].sample == (OPENAL_SAMPLE *) stream) - { + for (int i = 0; i < num_channels; i++) { + if (impl_channels[i].sample == (OPENAL_SAMPLE *) stream) { alSourceStop(impl_channels[i].sid); impl_channels[i].startpaused = false; } @@ -648,54 +610,42 @@ extern int channels[]; extern "C" void PlaySoundEx(int chan, OPENAL_SAMPLE *sptr, OPENAL_DSPUNIT *dsp, signed char startpaused) { - const OPENAL_SAMPLE * currSample = OPENAL_GetCurrentSample(channels[chan]); - if (currSample && currSample == samp[chan]) - { - if (OPENAL_GetPaused(channels[chan])) - { - OPENAL_StopSound(channels[chan]); - channels[chan] = OPENAL_FREE; - } - else if (OPENAL_IsPlaying(channels[chan])) - { - int loop_mode = OPENAL_GetLoopMode(channels[chan]); - if (loop_mode & OPENAL_LOOP_OFF) - { - channels[chan] = OPENAL_FREE; - } - } - } - else - { - channels[chan] = OPENAL_FREE; - } - - channels[chan] = OPENAL_PlaySoundEx(channels[chan], sptr, dsp, startpaused); - if (channels[chan] < 0) - { - channels[chan] = OPENAL_PlaySoundEx(OPENAL_FREE, sptr, dsp, startpaused); - } + const OPENAL_SAMPLE * currSample = OPENAL_GetCurrentSample(channels[chan]); + if (currSample && currSample == samp[chan]) { + if (OPENAL_GetPaused(channels[chan])) { + OPENAL_StopSound(channels[chan]); + channels[chan] = OPENAL_FREE; + } else if (OPENAL_IsPlaying(channels[chan])) { + int loop_mode = OPENAL_GetLoopMode(channels[chan]); + if (loop_mode & OPENAL_LOOP_OFF) { + channels[chan] = OPENAL_FREE; + } + } + } else { + channels[chan] = OPENAL_FREE; + } + + channels[chan] = OPENAL_PlaySoundEx(channels[chan], sptr, dsp, startpaused); + if (channels[chan] < 0) { + channels[chan] = OPENAL_PlaySoundEx(OPENAL_FREE, sptr, dsp, startpaused); + } } extern "C" void PlayStreamEx(int chan, OPENAL_STREAM *sptr, OPENAL_DSPUNIT *dsp, signed char startpaused) { - const OPENAL_SAMPLE * currSample = OPENAL_GetCurrentSample(channels[chan]); - if (currSample && currSample == OPENAL_Stream_GetSample(sptr)) - { - OPENAL_StopSound(channels[chan]); - OPENAL_Stream_Stop(sptr); - } - else - { - OPENAL_Stream_Stop(sptr); - channels[chan] = OPENAL_FREE; - } - - channels[chan] = OPENAL_Stream_PlayEx(channels[chan], sptr, dsp, startpaused); - if (channels[chan] < 0) - { - channels[chan] = OPENAL_Stream_PlayEx(OPENAL_FREE, sptr, dsp, startpaused); - } + const OPENAL_SAMPLE * currSample = OPENAL_GetCurrentSample(channels[chan]); + if (currSample && currSample == OPENAL_Stream_GetSample(sptr)) { + OPENAL_StopSound(channels[chan]); + OPENAL_Stream_Stop(sptr); + } else { + OPENAL_Stream_Stop(sptr); + channels[chan] = OPENAL_FREE; + } + + channels[chan] = OPENAL_Stream_PlayEx(channels[chan], sptr, dsp, startpaused); + if (channels[chan] < 0) { + channels[chan] = OPENAL_Stream_PlayEx(OPENAL_FREE, sptr, dsp, startpaused); + } } #endif