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

Lock the context while deleting sources only as needed

Browse Source
This commit is contained in:
Chris Robinson
2011-08-30 00:33:01 -07:00
parent d546813c05
commit ee60248d19
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenAL32/alSource.c
+14 -6
View File
@@ -127,7 +127,6 @@ AL_API ALvoid AL_APIENTRY alDeleteSources(ALsizei n, const ALuint *sources)
alSetError(Context, AL_INVALID_VALUE);
else
{
LockContext(Context);
// Check that all Sources are valid (and can therefore be deleted)
for(i = 0;i < n;i++)
{
@@ -142,22 +141,32 @@ AL_API ALvoid AL_APIENTRY alDeleteSources(ALsizei n, const ALuint *sources)
// All Sources are valid, and can be deleted
for(i = 0;i < n;i++)
{
ALsource **srclist, **srclistend;
LockContext(Context);
if((Source=LookupSource(Context->SourceMap, sources[i])) == NULL)
{
UnlockContext(Context);
continue;
}
// Remove Source from list of Sources
RemoveUIntMapKey(&Context->SourceMap, Source->source);
FreeThunkEntry(Source->source);
for(j = 0;j < Context->ActiveSourceCount;j++)
srclist = Context->ActiveSources;
srclistend = srclist + Context->ActiveSourceCount;
while(srclist != srclistend)
{
if(Context->ActiveSources[j] == Source)
if(*srclist == Source)
{
ALsizei end = --(Context->ActiveSourceCount);
Context->ActiveSources[j] = Context->ActiveSources[end];
Context->ActiveSourceCount--;
*srclist = *(--srclistend);
break;
}
srclist++;
}
UnlockContext(Context);
// For each buffer in the source's queue...
while(Source->queue != NULL)
@@ -180,7 +189,6 @@ AL_API ALvoid AL_APIENTRY alDeleteSources(ALsizei n, const ALuint *sources)
memset(Source,0,sizeof(ALsource));
free(Source);
}
UnlockContext(Context);
}
ALCcontext_DecRef(Context);