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

Defer source state changes from alSourcePlay/Pause/Stop/Rewind calls

Browse Source
This commit is contained in:
Chris Robinson 2011-08-20 23:59:24 -07:00
parent 7ea71d8bfa
commit f196a9fc67
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenAL32/Include/alSource.h
View File

@ -51,6 +51,7 @@ typedef struct ALsource
enum Resampler Resampler; enum Resampler Resampler;
ALenum state; ALenum state;
ALenum new_state;
ALuint position; ALuint position;
ALuint position_fraction; ALuint position_fraction;

13
OpenAL32/alSource.c
View File

@ -1376,7 +1376,8 @@ AL_API ALvoid AL_APIENTRY alSourcePlayv(ALsizei n, const ALuint *sources)
for(i = 0;i < n;i++) for(i = 0;i < n;i++)
{ {
Source = (ALsource*)ALTHUNK_LOOKUPENTRY(sources[i]); Source = (ALsource*)ALTHUNK_LOOKUPENTRY(sources[i]);
SetSourceState(Source, Context, AL_PLAYING); if(Context->DeferUpdates) Source->new_state = AL_PLAYING;
else SetSourceState(Source, Context, AL_PLAYING);
} }
done: done:
@ -1421,7 +1422,8 @@ AL_API ALvoid AL_APIENTRY alSourcePausev(ALsizei n, const ALuint *sources)
for(i = 0;i < n;i++) for(i = 0;i < n;i++)
{ {
Source = (ALsource*)ALTHUNK_LOOKUPENTRY(sources[i]); Source = (ALsource*)ALTHUNK_LOOKUPENTRY(sources[i]);
SetSourceState(Source, Context, AL_PAUSED); if(Context->DeferUpdates) Source->new_state = AL_PAUSED;
else SetSourceState(Source, Context, AL_PAUSED);
} }
done: done:
@ -1466,7 +1468,8 @@ AL_API ALvoid AL_APIENTRY alSourceStopv(ALsizei n, const ALuint *sources)
for(i = 0;i < n;i++) for(i = 0;i < n;i++)
{ {
Source = (ALsource*)ALTHUNK_LOOKUPENTRY(sources[i]); Source = (ALsource*)ALTHUNK_LOOKUPENTRY(sources[i]);
SetSourceState(Source, Context, AL_STOPPED); if(Context->DeferUpdates) Source->new_state = AL_STOPPED;
else SetSourceState(Source, Context, AL_STOPPED);
} }
done: done:
@ -1511,7 +1514,8 @@ AL_API ALvoid AL_APIENTRY alSourceRewindv(ALsizei n, const ALuint *sources)
for(i = 0;i < n;i++) for(i = 0;i < n;i++)
{ {
Source = (ALsource*)ALTHUNK_LOOKUPENTRY(sources[i]); Source = (ALsource*)ALTHUNK_LOOKUPENTRY(sources[i]);
SetSourceState(Source, Context, AL_INITIAL); if(Context->DeferUpdates) Source->new_state = AL_INITIAL;
else SetSourceState(Source, Context, AL_INITIAL);
} }
done: done:
@ -1772,6 +1776,7 @@ static ALvoid InitSourceParams(ALsource *Source)
Source->Resampler = DefaultResampler; Source->Resampler = DefaultResampler;
Source->state = AL_INITIAL; Source->state = AL_INITIAL;
Source->new_state = AL_NONE;
Source->lSourceType = AL_UNDETERMINED; Source->lSourceType = AL_UNDETERMINED;
Source->NeedsUpdate = AL_TRUE; Source->NeedsUpdate = AL_TRUE;

18
OpenAL32/alState.c
View File

@ -591,7 +591,23 @@ AL_API ALvoid AL_APIENTRY alProcessUpdatesSOFT(void)
Context = GetLockedContext(); Context = GetLockedContext();
if(!Context) return; if(!Context) return;
Context->DeferUpdates = AL_FALSE; if(Context->DeferUpdates)
{
ALsizei pos;
Context->DeferUpdates = AL_FALSE;
for(pos = 0;pos < Context->SourceMap.size;pos++)
{
ALsource *src = Context->SourceMap.array[pos].value;
ALenum new_state;
new_state = src->new_state;
src->new_state = AL_NONE;
if(new_state)
SetSourceState(src, Context, new_state);
}
}
UnlockContext(Context); UnlockContext(Context);
} }