aboutsummaryrefslogtreecommitdiffstats
path: root/OpenAL32
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2012-02-12 08:45:19 -0800
committerChris Robinson <[email protected]>2012-02-12 08:45:19 -0800
commite394d14cdab07cab5fce75a2e175a3439c8c8edd (patch)
tree221a0c63315c7b66ba75f397ca77b47db33ad270 /OpenAL32
parent9f073b6f1b29a00d229e200f507bece1bd59336c (diff)
Use more proper enum names for the resampler
Diffstat (limited to 'OpenAL32')
-rw-r--r--OpenAL32/Include/alSource.h4
-rw-r--r--OpenAL32/Include/alu.h10
-rw-r--r--OpenAL32/alSource.c6
3 files changed, 9 insertions, 11 deletions
diff --git a/OpenAL32/Include/alSource.h b/OpenAL32/Include/alSource.h
index bed7cfec..be3210bd 100644
--- a/OpenAL32/Include/alSource.h
+++ b/OpenAL32/Include/alSource.h
@@ -17,8 +17,8 @@ extern "C" {
extern enum Resampler DefaultResampler;
-extern const ALsizei ResamplerPadding[RESAMPLER_MAX];
-extern const ALsizei ResamplerPrePadding[RESAMPLER_MAX];
+extern const ALsizei ResamplerPadding[ResamplerMax];
+extern const ALsizei ResamplerPrePadding[ResamplerMax];
typedef struct ALbufferlistitem
diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h
index 64e5f2e2..fa71480a 100644
--- a/OpenAL32/Include/alu.h
+++ b/OpenAL32/Include/alu.h
@@ -127,13 +127,11 @@ typedef ALvoid (*MixerFunc)(struct ALsource *self, ALCdevice *Device,
ALuint BufferSize);
enum Resampler {
- POINT_RESAMPLER = 0,
- LINEAR_RESAMPLER,
- CUBIC_RESAMPLER,
+ PointResampler,
+ LinearResampler,
+ CubicResampler,
- RESAMPLER_MAX,
- RESAMPLER_MIN = -1,
- RESAMPLER_DEFAULT = LINEAR_RESAMPLER
+ ResamplerMax,
};
enum Channel {
diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c
index d62a5c76..d52c69da 100644
--- a/OpenAL32/alSource.c
+++ b/OpenAL32/alSource.c
@@ -33,13 +33,13 @@
#include "alAuxEffectSlot.h"
-enum Resampler DefaultResampler = RESAMPLER_DEFAULT;
-const ALsizei ResamplerPadding[RESAMPLER_MAX] = {
+enum Resampler DefaultResampler = LinearResampler;
+const ALsizei ResamplerPadding[ResamplerMax] = {
0, /* Point */
1, /* Linear */
2, /* Cubic */
};
-const ALsizei ResamplerPrePadding[RESAMPLER_MAX] = {
+const ALsizei ResamplerPrePadding[ResamplerMax] = {
0, /* Point */
0, /* Linear */
1, /* Cubic */