X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2Fopenal_wrapper.cpp;h=82ba31f568696baa95b565da476ae56fa10d9b05;hb=fa4c560f9b84ea522f585dac609c7b6b4ce3042b;hp=1c3f2acd4d39351a57d63a000b9c1c88908a9cc1;hpb=8265984dce72d262e3865ebad4668d98b5b26d4a;p=lugaru.git diff --git a/Source/openal_wrapper.cpp b/Source/openal_wrapper.cpp index 1c3f2ac..82ba31f 100644 --- a/Source/openal_wrapper.cpp +++ b/Source/openal_wrapper.cpp @@ -112,37 +112,17 @@ typedef struct OPENAL_SAMPLE ALuint bid; // buffer id. int mode; int is2d; - float min_distance; } OPENAL_SAMPLE; -typedef struct OPENAL_STREAM -{ - char *name; - ALuint bid; // buffer id. - int mode; - int is2d; -} OPENAL_STREAM; - static size_t num_channels = 0; -static OPENAL_Channels *channels = NULL; +static OPENAL_Channels *impl_channels = NULL; static bool initialized = false; static float listener_position[3]; -static inline bool source_too_close(const int channel) -{ - const OPENAL_Channels *chan = &channels[channel]; - const float *pos = chan->position; - const float distance = sqrtf(powf((pos[0] - listener_position[0]), 2.0f) + - powf((pos[1] - listener_position[1]), 2.0f) + - powf((pos[2] - listener_position[2]), 2.0f)); - return (distance <= chan->sample->min_distance); -} - - static void set_channel_position(const int channel, const float x, const float y, const float z) { - OPENAL_Channels *chan = &channels[channel]; + OPENAL_Channels *chan = &impl_channels[channel]; chan->position[0] = x; chan->position[1] = y; @@ -153,7 +133,7 @@ static void set_channel_position(const int channel, const float x, return; const ALuint sid = chan->sid; - const bool no_attenuate = ((sptr->is2d) || (source_too_close(channel))); + const bool no_attenuate = sptr->is2d; if (no_attenuate) { @@ -187,7 +167,7 @@ AL_API void OPENAL_3D_Listener_SetAttributes(const float *pos, const float *vel, // adjust existing positions... for (int i = 0; i < num_channels; i++) { - const float *p = channels[i].position; + const float *p = impl_channels[i].position; set_channel_position(i, p[0], p[1], p[2]); } } @@ -205,12 +185,6 @@ AL_API signed char OPENAL_3D_SetAttributes(int channel, const float *pos, const return true; } -AL_API void OPENAL_3D_SetDopplerFactor(float scale) -{ - if (!initialized) return; - // unimplemented...looks like init routines just call this with scale == 0.0f anyhow. -} - AL_API signed char OPENAL_Init(int mixrate, int maxsoftwarechannels, unsigned int flags) { if (initialized) return false; @@ -253,10 +227,10 @@ AL_API signed char OPENAL_Init(int mixrate, int maxsoftwarechannels, unsigned in } num_channels = maxsoftwarechannels; - channels = new OPENAL_Channels[maxsoftwarechannels]; - memset(channels, '\0', sizeof (OPENAL_Channels) * num_channels); + impl_channels = new OPENAL_Channels[maxsoftwarechannels]; + memset(impl_channels, '\0', sizeof (OPENAL_Channels) * num_channels); for (int i = 0; i < num_channels; i++) - alGenSources(1, &channels[i].sid); // !!! FIXME: verify this didn't fail! + alGenSources(1, &impl_channels[i].sid); // !!! FIXME: verify this didn't fail! initialized = true; return true; @@ -271,9 +245,9 @@ AL_API void OPENAL_Close() { for (int i = 0; i < num_channels; i++) { - alSourceStop(channels[i].sid); - alSourcei(channels[i].sid, AL_BUFFER, 0); - alDeleteSources(1, &channels[i].sid); + alSourceStop(impl_channels[i].sid); + alSourcei(impl_channels[i].sid, AL_BUFFER, 0); + alDeleteSources(1, &impl_channels[i].sid); } ALCdevice *dev = alcGetContextsDevice(ctx); alcMakeContextCurrent(NULL); @@ -283,8 +257,8 @@ AL_API void OPENAL_Close() } num_channels = 0; - delete[] channels; - channels = NULL; + delete[] impl_channels; + impl_channels = NULL; unload_alsyms(); initialized = false; @@ -294,18 +268,18 @@ AL_API OPENAL_SAMPLE *OPENAL_GetCurrentSample(int channel) { if (!initialized) return NULL; if ((channel < 0) || (channel >= num_channels)) return NULL; - return channels[channel].sample; + return impl_channels[channel].sample; } AL_API signed char OPENAL_GetPaused(int channel) { if (!initialized) return false; if ((channel < 0) || (channel >= num_channels)) return false; - if (channels[channel].startpaused) + if (impl_channels[channel].startpaused) return(true); ALint state = 0; - alGetSourceiv(channels[channel].sid, AL_SOURCE_STATE, &state); + alGetSourceiv(impl_channels[channel].sid, AL_SOURCE_STATE, &state); return((state == AL_PAUSED) ? true : false); } @@ -314,7 +288,7 @@ AL_API unsigned int OPENAL_GetLoopMode(int channel) if (!initialized) return 0; if ((channel < 0) || (channel >= num_channels)) return 0; ALint loop = 0; - alGetSourceiv(channels[channel].sid, AL_LOOPING, &loop); + alGetSourceiv(impl_channels[channel].sid, AL_LOOPING, &loop); if (loop) return(OPENAL_LOOP_NORMAL); return OPENAL_LOOP_OFF; @@ -325,7 +299,7 @@ AL_API signed char OPENAL_IsPlaying(int channel) if (!initialized) return false; if ((channel < 0) || (channel >= num_channels)) return false; ALint state = 0; - alGetSourceiv(channels[channel].sid, AL_SOURCE_STATE, &state); + alGetSourceiv(impl_channels[channel].sid, AL_SOURCE_STATE, &state); return((state == AL_PLAYING) ? true : false); } @@ -339,7 +313,7 @@ AL_API int OPENAL_PlaySoundEx(int channel, OPENAL_SAMPLE *sptr, OPENAL_DSPUNIT * for (int i = 0; i < num_channels; i++) { ALint state = 0; - alGetSourceiv(channels[i].sid, AL_SOURCE_STATE, &state); + alGetSourceiv(impl_channels[i].sid, AL_SOURCE_STATE, &state); if ((state != AL_PLAYING) && (state != AL_PAUSED)) { channel = i; @@ -349,15 +323,15 @@ AL_API int OPENAL_PlaySoundEx(int channel, OPENAL_SAMPLE *sptr, OPENAL_DSPUNIT * } if ((channel < 0) || (channel >= num_channels)) return -1; - alSourceStop(channels[channel].sid); - channels[channel].sample = sptr; - alSourcei(channels[channel].sid, AL_BUFFER, sptr->bid); - alSourcei(channels[channel].sid, AL_LOOPING, (sptr->mode == OPENAL_LOOP_OFF) ? AL_FALSE : AL_TRUE); + alSourceStop(impl_channels[channel].sid); + impl_channels[channel].sample = sptr; + alSourcei(impl_channels[channel].sid, AL_BUFFER, sptr->bid); + alSourcei(impl_channels[channel].sid, AL_LOOPING, (sptr->mode == OPENAL_LOOP_OFF) ? AL_FALSE : AL_TRUE); set_channel_position(channel, 0.0f, 0.0f, 0.0f); - channels[channel].startpaused = ((startpaused) ? true : false); + impl_channels[channel].startpaused = ((startpaused) ? true : false); if (!startpaused) - alSourcePlay(channels[channel].sid); + alSourcePlay(impl_channels[channel].sid); return channel; } @@ -499,11 +473,11 @@ AL_API void OPENAL_Sample_Free(OPENAL_SAMPLE *sptr) { for (int i = 0; i < num_channels; i++) { - if (channels[i].sample == sptr) + if (impl_channels[i].sample == sptr) { - alSourceStop(channels[i].sid); - alSourcei(channels[i].sid, AL_BUFFER, 0); - channels[i].sample = NULL; + alSourceStop(impl_channels[i].sid); + alSourcei(impl_channels[i].sid, AL_BUFFER, 0); + impl_channels[i].sample = NULL; } } alDeleteBuffers(1, &sptr->bid); @@ -521,27 +495,6 @@ AL_API signed char OPENAL_Sample_SetMode(OPENAL_SAMPLE *sptr, unsigned int mode) return true; } -AL_API signed char OPENAL_Sample_SetMinMaxDistance(OPENAL_SAMPLE *sptr, float mindist, float maxdist) -{ - if (!initialized) return false; - if (sptr == NULL) return false; - sptr->min_distance = mindist; - // we ignore maxdist. It's not really important to this game, and the - // FMOD docs suggest that it's worthless anyhow. - - // recalc sources to see if we need to adjust attenuation. - for (int i = 0; i < num_channels; i++) - { - if (channels[i].sample == sptr) - { - const float *p = channels[i].position; - set_channel_position(i, p[0], p[1], p[2]); - } - } - - return 0; -} - AL_API signed char OPENAL_SetFrequency(int channel, int freq) { if (!initialized) return false; @@ -554,9 +507,9 @@ AL_API signed char OPENAL_SetFrequency(int channel, int freq) if ((channel < 0) || (channel >= num_channels)) return false; if (freq == 8012) // hack - alSourcef(channels[channel].sid, AL_PITCH, 8012.0f / 44100.0f); + alSourcef(impl_channels[channel].sid, AL_PITCH, 8012.0f / 44100.0f); else - alSourcef(channels[channel].sid, AL_PITCH, 1.0f); + alSourcef(impl_channels[channel].sid, AL_PITCH, 1.0f); return true; } @@ -576,7 +529,7 @@ AL_API signed char OPENAL_SetVolume(int channel, int vol) if (vol < 0) vol = 0; else if (vol > 255) vol = 255; ALfloat gain = ((ALfloat) vol) / 255.0f; - alSourcef(channels[channel].sid, AL_GAIN, gain); + alSourcef(impl_channels[channel].sid, AL_GAIN, gain); return true; } @@ -594,17 +547,17 @@ AL_API signed char OPENAL_SetPaused(int channel, signed char paused) if ((channel < 0) || (channel >= num_channels)) return false; ALint state = 0; - if (channels[channel].startpaused) + if (impl_channels[channel].startpaused) state = AL_PAUSED; else - alGetSourceiv(channels[channel].sid, AL_SOURCE_STATE, &state); + alGetSourceiv(impl_channels[channel].sid, AL_SOURCE_STATE, &state); if ((paused) && (state == AL_PLAYING)) - alSourcePause(channels[channel].sid); + alSourcePause(impl_channels[channel].sid); else if ((!paused) && (state == AL_PAUSED)) { - alSourcePlay(channels[channel].sid); - channels[channel].startpaused = false; + alSourcePlay(impl_channels[channel].sid); + impl_channels[channel].startpaused = false; } return true; } @@ -628,16 +581,11 @@ AL_API signed char OPENAL_StopSound(int channel) } if ((channel < 0) || (channel >= num_channels)) return false; - alSourceStop(channels[channel].sid); - channels[channel].startpaused = false; + alSourceStop(impl_channels[channel].sid); + impl_channels[channel].startpaused = false; return true; } -AL_API OPENAL_STREAM *OPENAL_Stream_Open(const char *name_or_data, unsigned int mode, int offset, int length) -{ - return (OPENAL_STREAM *) OPENAL_Sample_Load(OPENAL_FREE, name_or_data, mode, offset, length); -} - AL_API void OPENAL_Stream_Close(OPENAL_STREAM *stream) { OPENAL_Sample_Free((OPENAL_SAMPLE *) stream); @@ -659,10 +607,10 @@ AL_API signed char OPENAL_Stream_Stop(OPENAL_STREAM *stream) if (!initialized) return false; for (int i = 0; i < num_channels; i++) { - if (channels[i].sample == (OPENAL_SAMPLE *) stream) + if (impl_channels[i].sample == (OPENAL_SAMPLE *) stream) { - alSourceStop(channels[i].sid); - channels[i].startpaused = false; + alSourceStop(impl_channels[i].sid); + impl_channels[i].startpaused = false; } } return true;