aboutsummaryrefslogtreecommitdiffstats
path: root/OpenAL32/alSource.c
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2010-09-21 16:54:33 -0700
committerChris Robinson <[email protected]>2010-09-21 16:54:33 -0700
commit97daaade8a123a8bcac52752febbca9f1d43b0aa (patch)
tree70d3c92437ea6d65ec73065472d0d96825784347 /OpenAL32/alSource.c
parent8a1d5a21c3b569424bdbe5b92d9e53aab00a60c6 (diff)
Reduce some more indentation
Diffstat (limited to 'OpenAL32/alSource.c')
-rw-r--r--OpenAL32/alSource.c86
1 files changed, 42 insertions, 44 deletions
diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c
index a863876e..3b877926 100644
--- a/OpenAL32/alSource.c
+++ b/OpenAL32/alSource.c
@@ -99,11 +99,10 @@ AL_API ALvoid AL_APIENTRY alGenSources(ALsizei n,ALuint *sources)
AL_API ALvoid AL_APIENTRY alDeleteSources(ALsizei n, const ALuint *sources)
{
ALCcontext *Context;
- ALCdevice *Device;
ALsource *Source;
ALsizei i, j;
ALbufferlistitem *BufferList;
- ALboolean bSourcesValid = AL_TRUE;
+ ALboolean SourcesValid = AL_FALSE;
Context = GetContextSuspended();
if(!Context) return;
@@ -112,65 +111,64 @@ AL_API ALvoid AL_APIENTRY alDeleteSources(ALsizei n, const ALuint *sources)
alSetError(Context, AL_INVALID_VALUE);
else
{
- Device = Context->Device;
-
+ SourcesValid = AL_TRUE;
// Check that all Sources are valid (and can therefore be deleted)
for(i = 0;i < n;i++)
{
if(LookupSource(Context->SourceMap, sources[i]) == NULL)
{
alSetError(Context, AL_INVALID_NAME);
- bSourcesValid = AL_FALSE;
+ SourcesValid = AL_FALSE;
break;
}
}
+ }
- if(bSourcesValid)
+ if(SourcesValid)
+ {
+ // All Sources are valid, and can be deleted
+ for(i = 0;i < n;i++)
{
- // All Sources are valid, and can be deleted
- for(i = 0;i < n;i++)
+ // Recheck that the Source is valid, because there could be duplicated Source names
+ if((Source=LookupSource(Context->SourceMap, sources[i])) == NULL)
+ continue;
+
+ for(j = 0;j < Context->ActiveSourceCount;j++)
{
- // Recheck that the Source is valid, because there could be duplicated Source names
- if((Source=LookupSource(Context->SourceMap, sources[i])) != NULL)
+ if(Context->ActiveSources[j] == Source)
{
- for(j = 0;j < Context->ActiveSourceCount;j++)
- {
- if(Context->ActiveSources[j] == Source)
- {
- ALsizei end = --(Context->ActiveSourceCount);
- Context->ActiveSources[j] = Context->ActiveSources[end];
- break;
- }
- }
+ ALsizei end = --(Context->ActiveSourceCount);
+ Context->ActiveSources[j] = Context->ActiveSources[end];
+ break;
+ }
+ }
- // For each buffer in the source's queue, decrement its reference counter and remove it
- while(Source->queue != NULL)
- {
- BufferList = Source->queue;
- // Decrement buffer's reference counter
- if(BufferList->buffer != NULL)
- BufferList->buffer->refcount--;
- // Update queue to point to next element in list
- Source->queue = BufferList->next;
- // Release memory allocated for buffer list item
- free(BufferList);
- }
+ // For each buffer in the source's queue...
+ while(Source->queue != NULL)
+ {
+ BufferList = Source->queue;
+ // Decrement buffer's reference counter
+ if(BufferList->buffer != NULL)
+ BufferList->buffer->refcount--;
+ // Update queue to point to next element in list
+ Source->queue = BufferList->next;
+ // Release memory allocated for buffer list item
+ free(BufferList);
+ }
- for(j = 0;j < MAX_SENDS;++j)
- {
- if(Source->Send[j].Slot)
- Source->Send[j].Slot->refcount--;
- Source->Send[j].Slot = NULL;
- }
+ for(j = 0;j < MAX_SENDS;++j)
+ {
+ if(Source->Send[j].Slot)
+ Source->Send[j].Slot->refcount--;
+ Source->Send[j].Slot = NULL;
+ }
- // Remove Source from list of Sources
- RemoveUIntMapKey(&Context->SourceMap, Source->source);
- ALTHUNK_REMOVEENTRY(Source->source);
+ // Remove Source from list of Sources
+ RemoveUIntMapKey(&Context->SourceMap, Source->source);
+ ALTHUNK_REMOVEENTRY(Source->source);
- memset(Source,0,sizeof(ALsource));
- free(Source);
- }
- }
+ memset(Source,0,sizeof(ALsource));
+ free(Source);
}
}