From 4f70766b954b72d310fbe53db6d2331e4f0aeebe Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Fri, 14 Sep 2012 02:52:37 -0700 Subject: [PATCH] Move a couple macros to more appropriate headers --- OpenAL32/Include/alFilter.h | 2 ++ OpenAL32/Include/alMain.h | 12 +++--------- OpenAL32/Include/alu.h | 3 +++ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/OpenAL32/Include/alFilter.h b/OpenAL32/Include/alFilter.h index 02ce5c3b..09cef93c 100644 --- a/OpenAL32/Include/alFilter.h +++ b/OpenAL32/Include/alFilter.h @@ -7,6 +7,8 @@ extern "C" { #endif +#define LOWPASSFREQREF (5000) + typedef struct { ALfloat coeff; #ifndef _MSC_VER diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index 3bfb0046..e68975b1 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -382,17 +382,11 @@ static __inline void UnlockUIntMapWrite(UIntMap *map) extern "C" { #endif - -#define DEFAULT_OUTPUT_RATE (44100) -#define MIN_OUTPUT_RATE (8000) - -#define SPEEDOFSOUNDMETRESPERSEC (343.3f) -#define AIRABSORBGAINHF (0.99426f) /* -0.05dB */ - -#define LOWPASSFREQREF (5000) +struct Hrtf; -struct Hrtf; +#define DEFAULT_OUTPUT_RATE (44100) +#define MIN_OUTPUT_RATE (8000) // Find the next power-of-2 for non-power-of-2 numbers. diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h index 5e46dec1..a4ad48c8 100644 --- a/OpenAL32/Include/alu.h +++ b/OpenAL32/Include/alu.h @@ -91,6 +91,9 @@ typedef ALvoid (*WetMixerFunc)(struct SendParams *params, ALuint BufferSize); +#define SPEEDOFSOUNDMETRESPERSEC (343.3f) +#define AIRABSORBGAINHF (0.99426f) /* -0.05dB */ + #define FRACTIONBITS (14) #define FRACTIONONE (1<