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

Defer source offset changes requested by the app

Browse Source
This commit is contained in:
Chris Robinson 2011-08-21 00:49:04 -07:00
parent a97211b572
commit 858592832f
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenAL32/Include/alSource.h
View File

@ -131,6 +131,8 @@ typedef struct ALsource
#define ALsource_Update(s,a) ((s)->Update(s,a)) #define ALsource_Update(s,a) ((s)->Update(s,a))
ALvoid SetSourceState(ALsource *Source, ALCcontext *Context, ALenum state); ALvoid SetSourceState(ALsource *Source, ALCcontext *Context, ALenum state);
ALboolean ApplyOffset(ALsource *Source);
ALvoid ReleaseALSources(ALCcontext *Context); ALvoid ReleaseALSources(ALCcontext *Context);
#ifdef __cplusplus #ifdef __cplusplus

9
OpenAL32/alSource.c
View File

@ -48,7 +48,6 @@ const ALsizei ResamplerPrePadding[RESAMPLER_MAX] = {
static ALvoid InitSourceParams(ALsource *Source); static ALvoid InitSourceParams(ALsource *Source);
static ALvoid GetSourceOffset(ALsource *Source, ALenum eName, ALdouble *Offsets, ALdouble updateLen); static ALvoid GetSourceOffset(ALsource *Source, ALenum eName, ALdouble *Offsets, ALdouble updateLen);
static ALboolean ApplyOffset(ALsource *Source);
static ALint GetByteOffset(ALsource *Source); static ALint GetByteOffset(ALsource *Source);
#define LookupSource(m, k) ((ALsource*)LookupUIntMapKey(&(m), (k))) #define LookupSource(m, k) ((ALsource*)LookupUIntMapKey(&(m), (k)))
@ -368,7 +367,8 @@ AL_API ALvoid AL_APIENTRY alSourcef(ALuint source, ALenum eParam, ALfloat flValu
else else
Source->lOffset = (ALint)flValue; Source->lOffset = (ALint)flValue;
if ((Source->state == AL_PLAYING) || (Source->state == AL_PAUSED)) if((Source->state == AL_PLAYING || Source->state == AL_PAUSED) &&
!pContext->DeferUpdates)
{ {
if(ApplyOffset(Source) == AL_FALSE) if(ApplyOffset(Source) == AL_FALSE)
alSetError(pContext, AL_INVALID_VALUE); alSetError(pContext, AL_INVALID_VALUE);
@ -636,7 +636,8 @@ AL_API ALvoid AL_APIENTRY alSourcei(ALuint source,ALenum eParam,ALint lValue)
else else
Source->lOffset = lValue; Source->lOffset = lValue;
if(Source->state == AL_PLAYING || Source->state == AL_PAUSED) if((Source->state == AL_PLAYING || Source->state == AL_PAUSED) &&
!pContext->DeferUpdates)
{ {
if(ApplyOffset(Source) == AL_FALSE) if(ApplyOffset(Source) == AL_FALSE)
alSetError(pContext, AL_INVALID_VALUE); alSetError(pContext, AL_INVALID_VALUE);
@ -2016,7 +2017,7 @@ static ALvoid GetSourceOffset(ALsource *Source, ALenum name, ALdouble *offset, A
Apply a playback offset to the Source. This function will update the queue (to correctly Apply a playback offset to the Source. This function will update the queue (to correctly
mark buffers as 'pending' or 'processed' depending upon the new offset. mark buffers as 'pending' or 'processed' depending upon the new offset.
*/ */
static ALboolean ApplyOffset(ALsource *Source) ALboolean ApplyOffset(ALsource *Source)
{ {
const ALbufferlistitem *BufferList; const ALbufferlistitem *BufferList;
const ALbuffer *Buffer; const ALbuffer *Buffer;

11
OpenAL32/alState.c
View File

@ -599,13 +599,16 @@ AL_API ALvoid AL_APIENTRY alProcessUpdatesSOFT(void)
for(pos = 0;pos < Context->SourceMap.size;pos++) for(pos = 0;pos < Context->SourceMap.size;pos++)
{ {
ALsource *src = Context->SourceMap.array[pos].value; ALsource *Source = Context->SourceMap.array[pos].value;
ALenum new_state; ALenum new_state;
new_state = src->new_state; if(Source->lOffset != -1)
src->new_state = AL_NONE; ApplyOffset(Source);
new_state = Source->new_state;
Source->new_state = AL_NONE;
if(new_state) if(new_state)
SetSourceState(src, Context, new_state); SetSourceState(Source, Context, new_state);
} }
} }