AerialX/openal-soft-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add initial structural support for AL_EXT_loop_points

Browse Source
This commit is contained in:
Chris Robinson 2010-05-13 02:03:48 -07:00
parent 61b682131e
commit 0ce138341c
3 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Alc/ALc.c
View File

@ -354,8 +354,8 @@ static ALCenum g_eLastNullDeviceError = ALC_NO_ERROR;
// Default context extensions
static const ALchar alExtList[] =
"AL_EXTX_buffer_sub_data AL_EXT_DOUBLE AL_EXT_EXPONENT_DISTANCE "
"AL_EXT_FLOAT32 AL_EXT_IMA4 AL_EXT_LINEAR_DISTANCE AL_EXT_MCFORMATS "
"AL_EXT_MULAW AL_EXT_MULAW_MCFORMATS AL_EXT_OFFSET "
"AL_EXT_FLOAT32 AL_EXT_IMA4 AL_EXT_LINEAR_DISTANCE AL_EXTX_loop_points "
"AL_EXT_MCFORMATS AL_EXT_MULAW AL_EXT_MULAW_MCFORMATS AL_EXT_OFFSET "
"AL_EXTX_sample_buffer_object AL_EXT_source_distance_model "
"AL_LOKI_quadriphonic";

3
OpenAL32/Include/alBuffer.h
View File

@ -21,6 +21,9 @@ typedef struct ALbuffer
ALsizei OriginalSize;
ALsizei OriginalAlign;
ALsizei LoopStart;
ALsizei LoopEnd;
ALuint refcount; // Number of sources using this buffer (deletion can only occur when this is 0)
// Index to itself

43
OpenAL32/alBuffer.c
View File

@ -342,6 +342,9 @@ AL_API ALvoid AL_APIENTRY alBufferData(ALuint buffer,ALenum format,const ALvoid
ALBuf->OriginalSize = size;
ALBuf->OriginalAlign = OrigBytes * 2;
ALBuf->LoopStart = 0;
ALBuf->LoopEnd = size;
}
else
alSetError(Context, AL_OUT_OF_MEMORY);
@ -415,6 +418,9 @@ AL_API ALvoid AL_APIENTRY alBufferData(ALuint buffer,ALenum format,const ALvoid
ALBuf->OriginalSize = size;
ALBuf->OriginalAlign = 36 * OrigChans;
ALBuf->LoopStart = 0;
ALBuf->LoopEnd = size;
}
else
alSetError(Context, AL_OUT_OF_MEMORY);
@ -459,6 +465,9 @@ AL_API ALvoid AL_APIENTRY alBufferData(ALuint buffer,ALenum format,const ALvoid
ALBuf->OriginalSize = size;
ALBuf->OriginalAlign = 1 * Channels;
ALBuf->LoopStart = 0;
ALBuf->LoopEnd = size;
}
else
alSetError(Context, AL_OUT_OF_MEMORY);
@ -493,6 +502,9 @@ AL_API ALvoid AL_APIENTRY alBufferData(ALuint buffer,ALenum format,const ALvoid
ALBuf->OriginalSize = size;
ALBuf->OriginalAlign = 1 * OrigChans;
ALBuf->LoopStart = 0;
ALBuf->LoopEnd = size;
}
else
alSetError(Context, AL_OUT_OF_MEMORY);
@ -823,6 +835,7 @@ AL_API void AL_APIENTRY alBufferiv(ALuint buffer, ALenum eParam, const ALint* pl
{
ALCcontext *pContext;
ALCdevice *device;
ALbuffer *ALBuf;
(void)plValues;
@ -830,10 +843,27 @@ AL_API void AL_APIENTRY alBufferiv(ALuint buffer, ALenum eParam, const ALint* pl
if(!pContext) return;
device = pContext->Device;
if(LookupBuffer(device->BufferMap, buffer) != NULL)
if((ALBuf=LookupBuffer(device->BufferMap, buffer)) != NULL)
{
switch(eParam)
{
case AL_LOOP_POINTS:
if(ALBuf->refcount > 0)
alSetError(pContext, AL_INVALID_OPERATION);
else if(plValues[0] < 0 || plValues[1] < 0 ||
plValues[0] > ALBuf->OriginalSize ||
plValues[1] > ALBuf->OriginalSize ||
(plValues[0]%ALBuf->OriginalAlign) ||
(plValues[0]%ALBuf->OriginalAlign) ||
plValues[0] >= plValues[1])
alSetError(pContext, AL_INVALID_VALUE);
else
{
ALBuf->LoopStart = plValues[0];
ALBuf->LoopEnd = plValues[1];
}
break;
default:
alSetError(pContext, AL_INVALID_ENUM);
break;
@ -1039,6 +1069,7 @@ AL_API void AL_APIENTRY alGetBufferiv(ALuint buffer, ALenum eParam, ALint* plVal
{
ALCcontext *pContext;
ALCdevice *device;
ALbuffer *ALBuf;
pContext = GetContextSuspended();
if(!pContext) return;
@ -1046,7 +1077,7 @@ AL_API void AL_APIENTRY alGetBufferiv(ALuint buffer, ALenum eParam, ALint* plVal
if (plValues)
{
device = pContext->Device;
if(LookupBuffer(device->BufferMap, buffer) != NULL)
if((ALBuf=LookupBuffer(device->BufferMap, buffer)) != NULL)
{
switch (eParam)
{
@ -1057,6 +1088,11 @@ AL_API void AL_APIENTRY alGetBufferiv(ALuint buffer, ALenum eParam, ALint* plVal
alGetBufferi(buffer, eParam, plValues);
break;
case AL_LOOP_POINTS:
plValues[0] = ALBuf->LoopStart;
plValues[1] = ALBuf->LoopEnd;
break;
default:
alSetError(pContext, AL_INVALID_ENUM);
break;
@ -1114,6 +1150,9 @@ static ALenum LoadData(ALbuffer *ALBuf, const ALubyte *data, ALsizei size, ALuin
ALBuf->OriginalSize = size;
ALBuf->OriginalAlign = OrigBytes * OrigChannels;
ALBuf->LoopStart = 0;
ALBuf->LoopEnd = size;
return AL_NO_ERROR;
}