diff options
| author | Chris Robinson <[email protected]> | 2008-02-08 19:55:51 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2008-02-08 19:55:51 -0800 |
| commit | acbb4f8e6cd95fa31b67e6af77aa61f88cfc3e11 (patch) | |
| tree | 23fa54491ba9be1a77333041c1204ff3a73f18a8 /OpenAL32/Include/alMain.h | |
| parent | 13a3fe8a7a6dd24b86138a5e0683541b634823fd (diff) | |
Include alext.h instead of redefining some enums
Diffstat (limited to 'OpenAL32/Include/alMain.h')
| -rw-r--r-- | OpenAL32/Include/alMain.h | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index fd37e93d..74ef39eb 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -84,11 +84,13 @@ 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" #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif extern CRITICAL_SECTION _alMutex; @@ -108,31 +110,6 @@ extern char _alDebug[256]; } while(0) -#define AL_FORMAT_MONO_FLOAT32 0x10010 -#define AL_FORMAT_STEREO_FLOAT32 0x10011 - -#define AL_FORMAT_MONO_IMA4 0x1300 -#define AL_FORMAT_STEREO_IMA4 0x1301 - -#define AL_FORMAT_QUAD8_LOKI 0x10004 -#define AL_FORMAT_QUAD16_LOKI 0x10005 - -#define AL_FORMAT_51CHN8 0x120A -#define AL_FORMAT_51CHN16 0x120B -#define AL_FORMAT_51CHN32 0x120C -#define AL_FORMAT_61CHN8 0x120D -#define AL_FORMAT_61CHN16 0x120E -#define AL_FORMAT_61CHN32 0x120F -#define AL_FORMAT_71CHN8 0x1210 -#define AL_FORMAT_71CHN16 0x1211 -#define AL_FORMAT_71CHN32 0x1212 -#define AL_FORMAT_QUAD8 0x1204 -#define AL_FORMAT_QUAD16 0x1205 -#define AL_FORMAT_QUAD32 0x1206 -#define AL_FORMAT_REAR8 0x1207 -#define AL_FORMAT_REAR16 0x1208 -#define AL_FORMAT_REAR32 0x1209 - #define SWMIXER_OUTPUT_RATE 44100 #define SPEEDOFSOUNDMETRESPERSEC (343.3f) |