diff options
| author | Chris Robinson <[email protected]> | 2011-03-16 05:47:07 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2011-03-16 05:47:07 -0700 |
| commit | 4a1c0fedca9c15cf7a6f6949f64a58472a929be3 (patch) | |
| tree | 6868774a60410755c67351c2e7478f20740d7b0b | |
| parent | b510958f9e5120b533ae16685aae8dc661e77333 (diff) | |
Use the defines for the UserFmt* and Fmt* types
| -rw-r--r-- | OpenAL32/Include/alBuffer.h | 46 | ||||
| -rw-r--r-- | OpenAL32/Include/alMain.h | 5 |
2 files changed, 26 insertions, 25 deletions
diff --git a/OpenAL32/Include/alBuffer.h b/OpenAL32/Include/alBuffer.h index e22d839d..1627a94e 100644 --- a/OpenAL32/Include/alBuffer.h +++ b/OpenAL32/Include/alBuffer.h @@ -9,25 +9,25 @@ extern "C" { /* Input formats (some are currently theoretical) */ enum UserFmtType { - UserFmtByte, /* AL_BYTE */ - UserFmtUByte, /* AL_UNSIGNED_BYTE */ - UserFmtShort, /* AL_SHORT */ - UserFmtUShort, /* AL_UNSIGNED_SHORT */ - UserFmtInt, /* AL_INT */ - UserFmtUInt, /* AL_UNSIGNED_INT */ - UserFmtFloat, /* AL_FLOAT */ - UserFmtDouble, /* AL_DOUBLE */ - UserFmtMulaw, /* AL_MULAW */ - UserFmtIMA4, /* AL_IMA4 */ + UserFmtByte = AL_BYTE, + UserFmtUByte = AL_UNSIGNED_BYTE, + UserFmtShort = AL_SHORT, + UserFmtUShort = AL_UNSIGNED_SHORT, + UserFmtInt = AL_INT, + UserFmtUInt = AL_UNSIGNED_INT, + UserFmtFloat = AL_FLOAT, + UserFmtDouble = AL_DOUBLE, + UserFmtMulaw = AL_MULAW, + UserFmtIMA4 = AL_IMA4 }; enum UserFmtChannels { - UserFmtMono, /* AL_MONO */ - UserFmtStereo, /* AL_STEREO */ - UserFmtRear, /* AL_REAR */ - UserFmtQuad, /* AL_QUAD */ - UserFmtX51, /* AL_5POINT1 (WFX order) */ - UserFmtX61, /* AL_6POINT1 (WFX order) */ - UserFmtX71, /* AL_7POINT1 (WFX order) */ + UserFmtMono = AL_MONO, + UserFmtStereo = AL_STEREO, + UserFmtRear = AL_REAR, + UserFmtQuad = AL_QUAD, + UserFmtX51 = AL_5POINT1, /* (WFX order) */ + UserFmtX61 = AL_6POINT1, /* (WFX order) */ + UserFmtX71 = AL_7POINT1 /* (WFX order) */ }; ALboolean DecomposeUserFormat(ALenum format, enum UserFmtChannels *chans, @@ -48,13 +48,13 @@ enum FmtType { FmtFloat = UserFmtFloat, }; enum FmtChannels { - FmtMono = UserFmtMono, + FmtMono = UserFmtMono, FmtStereo = UserFmtStereo, - FmtRear = UserFmtRear, - FmtQuad = UserFmtQuad, - FmtX51 = UserFmtX51, - FmtX61 = UserFmtX61, - FmtX71 = UserFmtX71, + FmtRear = UserFmtRear, + FmtQuad = UserFmtQuad, + FmtX51 = UserFmtX51, + FmtX61 = UserFmtX61, + FmtX71 = UserFmtX71, }; ALboolean DecomposeFormat(ALenum format, enum FmtChannels *chans, enum FmtType *type); diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index a7867e4d..75ebc488 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -13,8 +13,6 @@ #include "AL/alc.h" #include "AL/alext.h" -#ifndef ALC_SOFT_device_loopback -#define ALC_SOFT_device_loopback 1 #define AL_BYTE 1 #define AL_UNSIGNED_BYTE 2 #define AL_SHORT 3 @@ -32,6 +30,9 @@ #define AL_5POINT1 5 /* (WFX order) */ #define AL_6POINT1 6 /* (WFX order) */ #define AL_7POINT1 7 /* (WFX order) */ + +#ifndef ALC_SOFT_device_loopback +#define ALC_SOFT_device_loopback 1 #define ALC_FORMAT_CHANNELS 0x1990 #define ALC_FORMAT_TYPE 0x1991 typedef ALCdevice* (ALC_APIENTRY*LPALCLOOPBACKOPENDEVICE)(void); |