diff options
Diffstat (limited to 'OpenAL32')
-rw-r--r-- | OpenAL32/Include/alMain.h | 2 | ||||
-rw-r--r-- | OpenAL32/Include/alSource.h | 4 | ||||
-rw-r--r-- | OpenAL32/Include/alu.h | 12 | ||||
-rw-r--r-- | OpenAL32/alSource.c | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index 8b8db208..44f32e0f 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -413,7 +413,7 @@ struct ALCdevice_struct ALuint DevChannels[MAXCHANNELS]; - Channel Speaker2Chan[MAXCHANNELS]; + enum Channel Speaker2Chan[MAXCHANNELS]; ALfloat PanningLUT[LUT_NUM][MAXCHANNELS]; ALuint NumChan; diff --git a/OpenAL32/Include/alSource.h b/OpenAL32/Include/alSource.h index 8afe8281..7f50f7ef 100644 --- a/OpenAL32/Include/alSource.h +++ b/OpenAL32/Include/alSource.h @@ -15,7 +15,7 @@ extern "C" { #define SRC_HISTORY_LENGTH (1<<SRC_HISTORY_BITS) #define SRC_HISTORY_MASK (SRC_HISTORY_LENGTH-1) -extern resampler_t DefaultResampler; +extern enum Resampler DefaultResampler; extern const ALsizei ResamplerPadding[RESAMPLER_MAX]; extern const ALsizei ResamplerPrePadding[RESAMPLER_MAX]; @@ -48,7 +48,7 @@ typedef struct ALsource ALenum DistanceModel; ALboolean VirtualChannels; - resampler_t Resampler; + enum Resampler Resampler; ALenum state; ALuint position; diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h index 4e794f26..9ac3b234 100644 --- a/OpenAL32/Include/alu.h +++ b/OpenAL32/Include/alu.h @@ -70,7 +70,7 @@ typedef ALvoid (*MixerFunc)(struct ALsource *self, ALCdevice *Device, ALuint OutPos, ALuint SamplesToDo, ALuint BufferSize); -typedef enum { +enum Resampler { POINT_RESAMPLER = 0, LINEAR_RESAMPLER, CUBIC_RESAMPLER, @@ -78,9 +78,9 @@ typedef enum { RESAMPLER_MAX, RESAMPLER_MIN = -1, RESAMPLER_DEFAULT = LINEAR_RESAMPLER -} resampler_t; +}; -typedef enum { +enum Channel { FRONT_LEFT = 0, FRONT_RIGHT, FRONT_CENTER, @@ -92,7 +92,7 @@ typedef enum { SIDE_RIGHT, MAXCHANNELS -} Channel; +}; #define BUFFERSIZE 4096 @@ -135,8 +135,8 @@ ALint aluCart2LUTpos(ALfloat re, ALfloat im); ALvoid CalcSourceParams(struct ALsource *ALSource, const ALCcontext *ALContext); ALvoid CalcNonAttnSourceParams(struct ALsource *ALSource, const ALCcontext *ALContext); -MixerFunc SelectMixer(struct ALbuffer *Buffer, resampler_t Resampler); -MixerFunc SelectHrtfMixer(struct ALbuffer *Buffer, resampler_t Resampler); +MixerFunc SelectMixer(struct ALbuffer *Buffer, enum Resampler Resampler); +MixerFunc SelectHrtfMixer(struct ALbuffer *Buffer, enum Resampler Resampler); ALvoid MixSource(struct ALsource *Source, ALCdevice *Device, ALuint SamplesToDo); diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c index 1de380f9..a94a8f4a 100644 --- a/OpenAL32/alSource.c +++ b/OpenAL32/alSource.c @@ -33,7 +33,7 @@ #include "alAuxEffectSlot.h" -resampler_t DefaultResampler; +enum Resampler DefaultResampler; const ALsizei ResamplerPadding[RESAMPLER_MAX] = { 0, /* Point */ 1, /* Linear */ |