diff options
-rw-r--r-- | Alc/ALu.c | 14 | ||||
-rw-r--r-- | Alc/alcReverb.c | 15 | ||||
-rw-r--r-- | OpenAL32/Include/alMain.h | 3 | ||||
-rw-r--r-- | OpenAL32/Include/alu.h | 18 |
4 files changed, 18 insertions, 32 deletions
@@ -399,20 +399,6 @@ ALvoid aluInitPanning(ALCcontext *Context) } } -static __inline ALint aluCart2LUTpos(ALfloat re, ALfloat im) -{ - ALint pos = 0; - ALfloat denom = aluFabs(re) + aluFabs(im); - if(denom > 0.0f) - pos = (ALint)(QUADRANT_NUM*aluFabs(im) / denom + 0.5); - - if(re < 0.0) - pos = 2 * QUADRANT_NUM - pos; - if(im < 0.0) - pos = LUT_NUM - pos; - return pos%LUT_NUM; -} - static ALvoid CalcSourceParams(const ALCcontext *ALContext, ALsource *ALSource, ALboolean isMono) { diff --git a/Alc/alcReverb.c b/Alc/alcReverb.c index 2cfe341e..202e20ae 100644 --- a/Alc/alcReverb.c +++ b/Alc/alcReverb.c @@ -393,21 +393,6 @@ ALvoid VerbDestroy(ALeffectState *effect) } } -// NOTE: Temp, remove later. -static __inline ALint aluCart2LUTpos(ALfloat re, ALfloat im) -{ - ALint pos = 0; - ALfloat denom = aluFabs(re) + aluFabs(im); - if(denom > 0.0f) - pos = (ALint)(QUADRANT_NUM*aluFabs(im) / denom + 0.5); - - if(re < 0.0) - pos = 2 * QUADRANT_NUM - pos; - if(im < 0.0) - pos = LUT_NUM - pos; - return pos%LUT_NUM; -} - // This updates the device-dependant reverb state. This is called on // initialization and any time the device parameters (eg. playback frequency, // format) have been changed. diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index bc6c6d8b..c929b358 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -163,9 +163,6 @@ static __inline void al_print(const char *fname, unsigned int line, const char * #define LOWPASSFREQCUTOFF (5000) -#define QUADRANT_NUM 128 -#define LUT_NUM (4 * QUADRANT_NUM) - typedef struct { ALCboolean (*OpenPlayback)(ALCdevice*, const ALCchar*); diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h index 62350c3f..978527e5 100644 --- a/OpenAL32/Include/alu.h +++ b/OpenAL32/Include/alu.h @@ -5,6 +5,7 @@ #include "AL/alc.h" #include "AL/alext.h" +#include <math.h> #ifdef HAVE_FLOAT_H #include <float.h> #endif @@ -46,6 +47,9 @@ #define __min min #endif +#define QUADRANT_NUM 128 +#define LUT_NUM (4 * QUADRANT_NUM) + #ifdef __cplusplus extern "C" { #endif @@ -145,6 +149,20 @@ static __inline ALuint aluChannelsFromFormat(ALenum format) } } +static __inline ALint aluCart2LUTpos(ALfloat re, ALfloat im) +{ + ALint pos = 0; + ALfloat denom = aluFabs(re) + aluFabs(im); + if(denom > 0.0f) + pos = (ALint)(QUADRANT_NUM*aluFabs(im) / denom + 0.5); + + if(re < 0.0) + pos = 2 * QUADRANT_NUM - pos; + if(im < 0.0) + pos = LUT_NUM - pos; + return pos%LUT_NUM; +} + ALvoid aluInitPanning(ALCcontext *Context); ALvoid aluMixData(ALCdevice *device, ALvoid *buffer, ALsizei size); ALvoid aluHandleDisconnect(ALCdevice *device); |