diff options
| author | Chris Robinson <[email protected]> | 2011-02-09 22:54:12 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2011-02-09 22:54:12 -0800 |
| commit | d9126eeb2c9e5b4d5d00027cd70aef0ae8900602 (patch) | |
| tree | f7ab7ec7612102dc12c2055f3915807a23c37487 | |
| parent | d8048e136f48eb89795857da917167eaa7dcbe06 (diff) | |
Finalize the loop points extension as AL_SOFT_loop_points
| -rw-r--r-- | Alc/ALc.c | 4 | ||||
| -rw-r--r-- | OpenAL32/Include/alMain.h | 5 | ||||
| -rw-r--r-- | OpenAL32/alBuffer.c | 4 | ||||
| -rw-r--r-- | include/AL/alext.h | 5 |
4 files changed, 9 insertions, 9 deletions
@@ -357,9 +357,9 @@ static ALCenum g_eLastNullDeviceError = ALC_NO_ERROR; // Default context extensions static const ALchar alExtList[] = "AL_EXT_DOUBLE AL_EXT_EXPONENT_DISTANCE AL_EXT_FLOAT32 AL_EXT_IMA4 " - "AL_EXT_LINEAR_DISTANCE AL_EXTX_loop_points AL_EXT_MCFORMATS AL_EXT_MULAW " + "AL_EXT_LINEAR_DISTANCE AL_EXT_MCFORMATS AL_EXT_MULAW " "AL_EXT_MULAW_MCFORMATS AL_EXT_OFFSET AL_EXT_source_distance_model " - "AL_LOKI_quadriphonic AL_SOFT_buffer_sub_data"; + "AL_LOKI_quadriphonic AL_SOFT_buffer_sub_data AL_SOFT_loop_points"; // Mixing Priority Level static ALint RTPrioLevel; diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index 310e0d92..02153a86 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -69,11 +69,6 @@ AL_API ALvoid AL_APIENTRY alUnmapDatabufferEXT(ALuint uiBuffer); #endif #endif -#ifndef AL_EXT_loop_points -#define AL_EXT_loop_points 1 -#define AL_LOOP_POINTS 0x2015 -#endif - #if defined(HAVE_STDINT_H) #include <stdint.h> diff --git a/OpenAL32/alBuffer.c b/OpenAL32/alBuffer.c index f8f30685..cb5a9288 100644 --- a/OpenAL32/alBuffer.c +++ b/OpenAL32/alBuffer.c @@ -607,7 +607,7 @@ AL_API void AL_APIENTRY alBufferiv(ALuint buffer, ALenum eParam, const ALint* pl { switch(eParam) { - case AL_LOOP_POINTS: + case AL_LOOP_POINTS_SOFT: if(ALBuf->refcount > 0) alSetError(pContext, AL_INVALID_OPERATION); else if(plValues[0] < 0 || plValues[1] < 0 || @@ -814,7 +814,7 @@ AL_API void AL_APIENTRY alGetBufferiv(ALuint buffer, ALenum eParam, ALint* plVal alGetBufferi(buffer, eParam, plValues); break; - case AL_LOOP_POINTS: + case AL_LOOP_POINTS_SOFT: plValues[0] = ALBuf->LoopStart; plValues[1] = ALBuf->LoopEnd; break; diff --git a/include/AL/alext.h b/include/AL/alext.h index c78b8c36..f3c7bcae 100644 --- a/include/AL/alext.h +++ b/include/AL/alext.h @@ -153,6 +153,11 @@ AL_API ALvoid AL_APIENTRY alBufferSubDataSOFT(ALuint buffer,ALenum format,const #endif #endif +#ifndef AL_SOFT_loop_points +#define AL_SOFT_loop_points 1 +#define AL_LOOP_POINTS_SOFT 0x2015 +#endif + #ifdef __cplusplus } #endif |