diff options
| -rw-r--r-- | Alc/ALu.c | 41 | ||||
| -rw-r--r-- | Alc/alcEcho.c | 7 | ||||
| -rw-r--r-- | Alc/alcReverb.c | 19 | ||||
| -rw-r--r-- | OpenAL32/Include/alMain.h | 10 | ||||
| -rw-r--r-- | OpenAL32/Include/alu.h | 41 |
5 files changed, 48 insertions, 70 deletions
@@ -40,15 +40,6 @@ #include "bs2b.h" #include "alReverb.h" -#if defined (HAVE_FLOAT_H) -#include <float.h> -#endif - -#ifndef M_PI -#define M_PI 3.14159265358979323846 /* pi */ -#define M_PI_2 1.57079632679489661923 /* pi/2 */ -#endif - #if defined(HAVE_STDINT_H) #include <stdint.h> typedef int64_t ALint64; @@ -60,38 +51,6 @@ typedef long ALint64; typedef long long ALint64; #endif -#ifdef HAVE_SQRTF -#define aluSqrt(x) ((ALfloat)sqrtf((float)(x))) -#else -#define aluSqrt(x) ((ALfloat)sqrt((double)(x))) -#endif - -#ifdef HAVE_ACOSF -#define aluAcos(x) ((ALfloat)acosf((float)(x))) -#else -#define aluAcos(x) ((ALfloat)acos((double)(x))) -#endif - -#ifdef HAVE_ATANF -#define aluAtan(x) ((ALfloat)atanf((float)(x))) -#else -#define aluAtan(x) ((ALfloat)atan((double)(x))) -#endif - -#ifdef HAVE_FABSF -#define aluFabs(x) ((ALfloat)fabsf((float)(x))) -#else -#define aluFabs(x) ((ALfloat)fabs((double)(x))) -#endif - -// fixes for mingw32. -#if defined(max) && !defined(__max) -#define __max max -#endif -#if defined(min) && !defined(__min) -#define __min min -#endif - #define FRACTIONBITS 14 #define FRACTIONMASK ((1L<<FRACTIONBITS)-1) #define MAX_PITCH 65536 diff --git a/Alc/alcEcho.c b/Alc/alcEcho.c index f6606bfa..e518fb21 100644 --- a/Alc/alcEcho.c +++ b/Alc/alcEcho.c @@ -27,12 +27,7 @@ #include "alFilter.h" #include "alAuxEffectSlot.h" #include "alEcho.h" - -#ifdef HAVE_SQRTF -#define aluSqrt(x) ((ALfloat)sqrtf((float)(x))) -#else -#define aluSqrt(x) ((ALfloat)sqrt((double)(x))) -#endif +#include "alu.h" struct ALechoState { ALfloat *SampleBuffer; diff --git a/Alc/alcReverb.c b/Alc/alcReverb.c index 91e60a8c..0516ab4f 100644 --- a/Alc/alcReverb.c +++ b/Alc/alcReverb.c @@ -29,24 +29,7 @@ #include "alAuxEffectSlot.h" #include "alEffect.h" #include "alReverb.h" - -#ifdef HAVE_SQRTF -#define aluSqrt(x) ((ALfloat)sqrtf((float)(x))) -#else -#define aluSqrt(x) ((ALfloat)sqrt((double)(x))) -#endif - -// fixes for mingw32. -#if defined(max) && !defined(__max) -#define __max max -#endif -#if defined(min) && !defined(__min) -#define __min min -#endif - -#ifndef M_PI -#define M_PI 3.14159265358979323846 /* pi */ -#endif +#include "alu.h" typedef struct DelayLine { diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index 849ce6e4..82877735 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -4,12 +4,14 @@ #include <string.h> #include <stdio.h> -#include "alu.h" - #ifdef HAVE_FENV_H #include <fenv.h> #endif +#include "AL/al.h" +#include "AL/alc.h" +#include "AL/alext.h" + #ifdef _WIN32 #ifndef _WIN32_WINNT @@ -98,10 +100,8 @@ static inline void Sleep(ALuint t) #define max(x,y) (((x)>(y))?(x):(y)) #endif -#include "AL/al.h" -#include "AL/alc.h" -#include "AL/alext.h" #include "alListener.h" +#include "alu.h" #ifdef __cplusplus extern "C" { diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h index 7c6e95b7..9bbcc464 100644 --- a/OpenAL32/Include/alu.h +++ b/OpenAL32/Include/alu.h @@ -4,6 +4,47 @@ #include "AL/al.h" #include "AL/alc.h" +#ifdef HAVE_FLOAT_H +#include <float.h> +#endif + +#ifndef M_PI +#define M_PI 3.14159265358979323846 /* pi */ +#define M_PI_2 1.57079632679489661923 /* pi/2 */ +#endif + +#ifdef HAVE_SQRTF +#define aluSqrt(x) ((ALfloat)sqrtf((float)(x))) +#else +#define aluSqrt(x) ((ALfloat)sqrt((double)(x))) +#endif + +#ifdef HAVE_ACOSF +#define aluAcos(x) ((ALfloat)acosf((float)(x))) +#else +#define aluAcos(x) ((ALfloat)acos((double)(x))) +#endif + +#ifdef HAVE_ATANF +#define aluAtan(x) ((ALfloat)atanf((float)(x))) +#else +#define aluAtan(x) ((ALfloat)atan((double)(x))) +#endif + +#ifdef HAVE_FABSF +#define aluFabs(x) ((ALfloat)fabsf((float)(x))) +#else +#define aluFabs(x) ((ALfloat)fabs((double)(x))) +#endif + +// fixes for mingw32. +#if defined(max) && !defined(__max) +#define __max max +#endif +#if defined(min) && !defined(__min) +#define __min min +#endif + #ifdef __cplusplus extern "C" { #endif |