diff options
author | Chris Robinson <[email protected]> | 2010-01-11 23:47:03 -0800 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2010-01-11 23:47:03 -0800 |
commit | 574792d2e1bf46f80fb257db6af68c47f5733b2e (patch) | |
tree | 8e6d555db4d349bd1d8e67df8fea03f3941ff9f6 | |
parent | ab2eb5a60373fda56bcc65e3a82686994a315767 (diff) |
Fix Windows compilation
-rw-r--r-- | Alc/ALu.c | 72 | ||||
-rw-r--r-- | OpenAL32/Include/alSource.h | 8 |
2 files changed, 40 insertions, 40 deletions
@@ -1107,12 +1107,12 @@ another_source: switch(Resampler) { - case POINT: DO_MIX(point); - break; - case LINEAR: DO_MIX(lerp); - break; - case COSINE: DO_MIX(cos_lerp); - break; + case POINT_RESAMPLER: + DO_MIX(point); break; + case LINEAR_RESAMPLER: + DO_MIX(lerp); break; + case COSINE_RESAMPLER: + DO_MIX(cos_lerp); break; case RESAMPLER_MIN: case RESAMPLER_MAX: break; @@ -1157,12 +1157,12 @@ another_source: switch(Resampler) { - case POINT: DO_MIX(point); - break; - case LINEAR: DO_MIX(lerp); - break; - case COSINE: DO_MIX(cos_lerp); - break; + case POINT_RESAMPLER: + DO_MIX(point); break; + case LINEAR_RESAMPLER: + DO_MIX(lerp); break; + case COSINE_RESAMPLER: + DO_MIX(cos_lerp); break; case RESAMPLER_MIN: case RESAMPLER_MAX: break; @@ -1178,12 +1178,12 @@ another_source: switch(Resampler) { - case POINT: DO_MIX(point); - break; - case LINEAR: DO_MIX(lerp); - break; - case COSINE: DO_MIX(cos_lerp); - break; + case POINT_RESAMPLER: + DO_MIX(point); break; + case LINEAR_RESAMPLER: + DO_MIX(lerp); break; + case COSINE_RESAMPLER: + DO_MIX(cos_lerp); break; case RESAMPLER_MIN: case RESAMPLER_MAX: break; @@ -1200,12 +1200,12 @@ another_source: switch(Resampler) { - case POINT: DO_MIX(point); - break; - case LINEAR: DO_MIX(lerp); - break; - case COSINE: DO_MIX(cos_lerp); - break; + case POINT_RESAMPLER: + DO_MIX(point); break; + case LINEAR_RESAMPLER: + DO_MIX(lerp); break; + case COSINE_RESAMPLER: + DO_MIX(cos_lerp); break; case RESAMPLER_MIN: case RESAMPLER_MAX: break; @@ -1223,12 +1223,12 @@ another_source: switch(Resampler) { - case POINT: DO_MIX(point); - break; - case LINEAR: DO_MIX(lerp); - break; - case COSINE: DO_MIX(cos_lerp); - break; + case POINT_RESAMPLER: + DO_MIX(point); break; + case LINEAR_RESAMPLER: + DO_MIX(lerp); break; + case COSINE_RESAMPLER: + DO_MIX(cos_lerp); break; case RESAMPLER_MIN: case RESAMPLER_MAX: break; @@ -1246,12 +1246,12 @@ another_source: switch(Resampler) { - case POINT: DO_MIX(point); - break; - case LINEAR: DO_MIX(lerp); - break; - case COSINE: DO_MIX(cos_lerp); - break; + case POINT_RESAMPLER: + DO_MIX(point); break; + case LINEAR_RESAMPLER: + DO_MIX(lerp); break; + case COSINE_RESAMPLER: + DO_MIX(cos_lerp); break; case RESAMPLER_MIN: case RESAMPLER_MAX: break; diff --git a/OpenAL32/Include/alSource.h b/OpenAL32/Include/alSource.h index dd9295c0..2316dd9f 100644 --- a/OpenAL32/Include/alSource.h +++ b/OpenAL32/Include/alSource.h @@ -23,13 +23,13 @@ extern "C" { #endif typedef enum { - POINT = 0, - LINEAR, - COSINE, + POINT_RESAMPLER = 0, + LINEAR_RESAMPLER, + COSINE_RESAMPLER, RESAMPLER_MAX, RESAMPLER_MIN = -1, - RESAMPLER_DEFAULT = LINEAR + RESAMPLER_DEFAULT = LINEAR_RESAMPLER } resampler_t; extern resampler_t DefaultResampler; |