Rename some struct members for consistency

9 files changed, 52 insertions, 52 deletions

diff --git a/Alc/ALc.c b/Alc/ALc.c
index 2ddb18d5..bafb2dbd 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -1291,7 +1291,7 @@ ALCAPI ALCcontext* ALCAPIENTRY alcCreateContext(ALCdevice *device, const ALCint
         ALsource *source;
 
         SuspendContext(context);
-        for(slot = context->AuxiliaryEffectSlot;slot != NULL;slot = slot->next)
+        for(slot = context->EffectSlotList;slot != NULL;slot = slot->next)
         {
             if(!slot->EffectState)
                 continue;
@@ -1308,7 +1308,7 @@ ALCAPI ALCcontext* ALCAPIENTRY alcCreateContext(ALCdevice *device, const ALCint
             ALEffect_Update(slot->EffectState, context, &slot->effect);
         }
 
-        for(source = context->Source;source != NULL;source = source->next)
+        for(source = context->SourceList;source != NULL;source = source->next)
         {
             ALuint s = device->NumAuxSends;
             while(s < MAX_SENDS)
@@ -1415,10 +1415,10 @@ ALCAPI ALCvoid ALCAPIENTRY alcDestroyContext(ALCcontext *context)
 #endif
             ReleaseALSources(context);
         }
-        if(context->AuxiliaryEffectSlotCount > 0)
+        if(context->EffectSlotCount > 0)
         {
 #ifdef _DEBUG
-            AL_PRINT("alcDestroyContext(): deleting %d AuxiliaryEffectSlot(s)\n", context->AuxiliaryEffectSlotCount);
+            AL_PRINT("alcDestroyContext(): deleting %d AuxiliaryEffectSlot(s)\n", context->EffectSlotCount);
 #endif
             ReleaseALAuxiliaryEffectSlots(context);
         }
diff --git a/Alc/ALu.c b/Alc/ALu.c
index 1e7b639a..47d109dd 100644
--- a/Alc/ALu.c
+++ b/Alc/ALu.c
@@ -900,7 +900,7 @@ static void MixSomeSources(ALCcontext *ALContext, float (*DryBuffer)[OUTPUTCHANN
     ALfloat Pitch;
     ALenum State;
 
-    if(!(ALSource=ALContext->Source))
+    if(!(ALSource=ALContext->SourceList))
         return;
 
     DeviceFreq = ALContext->Device->Frequency;
@@ -1357,7 +1357,7 @@ ALvoid aluMixData(ALCdevice *device, ALvoid *buffer, ALsizei size)
             MixSomeSources(ALContext, DryBuffer, SamplesToDo);
 
             /* effect slot processing */
-            ALEffectSlot = ALContext->AuxiliaryEffectSlot;
+            ALEffectSlot = ALContext->EffectSlotList;
             while(ALEffectSlot)
             {
                 if(ALEffectSlot->EffectState)
@@ -1491,7 +1491,7 @@ ALvoid aluHandleDisconnect(ALCdevice *device)
 
         SuspendContext(device->Contexts[i]);
 
-        source = device->Contexts[i]->Source;
+        source = device->Contexts[i]->SourceList;
         while(source)
         {
             if(source->state == AL_PLAYING)
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index 6fc6db34..19a57b6c 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -250,20 +250,20 @@ struct ALCdevice_struct
     ALuint       NumAuxSends;
 
     // Linked List of Buffers for this device
-    struct ALbuffer *Buffers;
-    ALuint          BufferCount;
+    struct ALbuffer *BufferList;
+    ALuint           BufferCount;
 
     // Linked List of Effects for this device
     struct ALeffect *EffectList;
-    ALuint          EffectCount;
+    ALuint           EffectCount;
 
     // Linked List of Filters for this device
     struct ALfilter *FilterList;
-    ALuint          FilterCount;
+    ALuint           FilterCount;
 
     // Linked List of Databuffers for this device
-    struct ALdatabuffer *Databuffers;
-    ALuint              DatabufferCount;
+    struct ALdatabuffer *DatabufferList;
+    ALuint               DatabufferCount;
 
     // Stereo-to-binaural filter
     struct bs2b *Bs2b;
@@ -302,11 +302,11 @@ struct ALCcontext_struct
 {
     ALlistener  Listener;
 
-    struct ALsource *Source;
+    struct ALsource *SourceList;
     ALuint           SourceCount;
 
-    struct ALeffectslot *AuxiliaryEffectSlot;
-    ALuint               AuxiliaryEffectSlotCount;
+    struct ALeffectslot *EffectSlotList;
+    ALuint               EffectSlotCount;
 
     struct ALdatabuffer *SampleSource;
     struct ALdatabuffer *SampleSink;
diff --git a/OpenAL32/alAuxEffectSlot.c b/OpenAL32/alAuxEffectSlot.c
index f6cb6e4b..86fa96e6 100644
--- a/OpenAL32/alAuxEffectSlot.c
+++ b/OpenAL32/alAuxEffectSlot.c
@@ -47,12 +47,12 @@ ALvoid AL_APIENTRY alGenAuxiliaryEffectSlots(ALsizei n, ALuint *effectslots)
     {
         ALCdevice *Device = Context->Device;
 
-        if(Context->AuxiliaryEffectSlotCount+n <= Device->AuxiliaryEffectSlotMax)
+        if(Context->EffectSlotCount+n <= Device->AuxiliaryEffectSlotMax)
         {
             // Check that enough memory has been allocted in the 'effectslots' array for n Effect Slots
             if (!IsBadWritePtr((void*)effectslots, n * sizeof(ALuint)))
             {
-                ALeffectslot **list = &Context->AuxiliaryEffectSlot;
+                ALeffectslot **list = &Context->EffectSlotList;
                 while(*list)
                     list = &(*list)->next;
 
@@ -78,7 +78,7 @@ ALvoid AL_APIENTRY alGenAuxiliaryEffectSlots(ALsizei n, ALuint *effectslots)
                     effectslots[i] = (ALuint)ALTHUNK_ADDENTRY(*list);
                     (*list)->effectslot = effectslots[i];
 
-                    Context->AuxiliaryEffectSlotCount++;
+                    Context->EffectSlotCount++;
                     i++;
 
                     list = &(*list)->next;
@@ -135,7 +135,7 @@ ALvoid AL_APIENTRY alDeleteAuxiliaryEffectSlots(ALsizei n, ALuint *effectslots)
                     ALAuxiliaryEffectSlot = ((ALeffectslot*)ALTHUNK_LOOKUPENTRY(effectslots[i]));
 
                     // Remove Source from list of Sources
-                    list = &Context->AuxiliaryEffectSlot;
+                    list = &Context->EffectSlotList;
                     while(*list && *list != ALAuxiliaryEffectSlot)
                          list = &(*list)->next;
 
@@ -149,7 +149,7 @@ ALvoid AL_APIENTRY alDeleteAuxiliaryEffectSlots(ALsizei n, ALuint *effectslots)
                     memset(ALAuxiliaryEffectSlot, 0, sizeof(ALeffectslot));
                     free(ALAuxiliaryEffectSlot);
 
-                    Context->AuxiliaryEffectSlotCount--;
+                    Context->EffectSlotCount--;
                 }
             }
         }
@@ -168,7 +168,7 @@ ALboolean AL_APIENTRY alIsAuxiliaryEffectSlot(ALuint effectslot)
     Context = GetContextSuspended();
     if(!Context) return AL_FALSE;
 
-    list = &Context->AuxiliaryEffectSlot;
+    list = &Context->EffectSlotList;
     while(*list && (*list)->effectslot != effectslot)
         list = &(*list)->next;
 
@@ -224,7 +224,7 @@ ALvoid AL_APIENTRY alAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint
     // sending parameters
     if(updateSources)
     {
-        ALsource *source = Context->Source;
+        ALsource *source = Context->SourceList;
         while(source)
         {
             ALuint i;
@@ -517,10 +517,10 @@ static ALvoid InitializeEffect(ALCcontext *Context, ALeffectslot *ALEffectSlot,
 
 ALvoid ReleaseALAuxiliaryEffectSlots(ALCcontext *Context)
 {
-    while(Context->AuxiliaryEffectSlot)
+    while(Context->EffectSlotList)
     {
-        ALeffectslot *temp = Context->AuxiliaryEffectSlot;
-        Context->AuxiliaryEffectSlot = Context->AuxiliaryEffectSlot->next;
+        ALeffectslot *temp = Context->EffectSlotList;
+        Context->EffectSlotList = temp->next;
 
         // Release effectslot structure
         if(temp->EffectState)
@@ -530,5 +530,5 @@ ALvoid ReleaseALAuxiliaryEffectSlots(ALCcontext *Context)
         memset(temp, 0, sizeof(ALeffectslot));
         free(temp);
     }
-    Context->AuxiliaryEffectSlotCount = 0;
+    Context->EffectSlotCount = 0;
 }
diff --git a/OpenAL32/alBuffer.c b/OpenAL32/alBuffer.c
index ace59ceb..2c909653 100644
--- a/OpenAL32/alBuffer.c
+++ b/OpenAL32/alBuffer.c
@@ -118,7 +118,7 @@ ALAPI ALvoid ALAPIENTRY alGenBuffers(ALsizei n,ALuint *puiBuffers)
         // Check the pointer is valid (and points to enough memory to store Buffer Names)
         if (!IsBadWritePtr((void*)puiBuffers, n * sizeof(ALuint)))
         {
-            ALbuffer **list = &device->Buffers;
+            ALbuffer **list = &device->BufferList;
             while(*list)
                 list = &(*list)->next;
 
@@ -205,7 +205,7 @@ ALAPI ALvoid ALAPIENTRY alDeleteBuffers(ALsizei n, const ALuint *puiBuffers)
             {
                 if (puiBuffers[i] && alIsBuffer(puiBuffers[i]))
                 {
-                    ALbuffer **list = &device->Buffers;
+                    ALbuffer **list = &device->BufferList;
 
                     ALBuf=((ALbuffer *)ALTHUNK_LOOKUPENTRY(puiBuffers[i]));
                     while(*list && *list != ALBuf)
@@ -254,7 +254,7 @@ ALAPI ALboolean ALAPIENTRY alIsBuffer(ALuint uiBuffer)
         TgtALBuf = (ALbuffer *)ALTHUNK_LOOKUPENTRY(uiBuffer);
 
         // Check through list of generated buffers for uiBuffer
-        ALBuf = device->Buffers;
+        ALBuf = device->BufferList;
         while (ALBuf)
         {
             if (ALBuf == TgtALBuf)
@@ -1263,7 +1263,7 @@ ALvoid ReleaseALBuffers(ALCdevice *device)
     ALbuffer *ALBuffer;
     ALbuffer *ALBufferTemp;
 
-    ALBuffer = device->Buffers;
+    ALBuffer = device->BufferList;
     while(ALBuffer)
     {
         // Release sample data
@@ -1275,6 +1275,6 @@ ALvoid ReleaseALBuffers(ALCdevice *device)
         memset(ALBufferTemp, 0, sizeof(ALbuffer));
         free(ALBufferTemp);
     }
-    device->Buffers = NULL;
+    device->BufferList = NULL;
     device->BufferCount = 0;
 }
diff --git a/OpenAL32/alDatabuffer.c b/OpenAL32/alDatabuffer.c
index 1bbe8be4..eaf7acab 100644
--- a/OpenAL32/alDatabuffer.c
+++ b/OpenAL32/alDatabuffer.c
@@ -54,7 +54,7 @@ ALvoid ALAPIENTRY alGenDatabuffersEXT(ALsizei n,ALuint *puiBuffers)
          * Databuffer Names) */
         if(!IsBadWritePtr((void*)puiBuffers, n * sizeof(ALuint)))
         {
-            ALdatabuffer **list = &device->Databuffers;
+            ALdatabuffer **list = &device->DatabufferList;
             while(*list)
                 list = &(*list)->next;
 
@@ -140,7 +140,7 @@ ALvoid ALAPIENTRY alDeleteDatabuffersEXT(ALsizei n, const ALuint *puiBuffers)
             {
                 if(puiBuffers[i] && alIsDatabufferEXT(puiBuffers[i]))
                 {
-                    ALdatabuffer **list = &device->Databuffers;
+                    ALdatabuffer **list = &device->DatabufferList;
 
                     ALBuf = (ALdatabuffer*)ALTHUNK_LOOKUPENTRY(puiBuffers[i]);
                     while(*list && *list != ALBuf)
@@ -186,7 +186,7 @@ ALboolean ALAPIENTRY alIsDatabufferEXT(ALuint uiBuffer)
     if(!Context) return AL_FALSE;
 
     /* Check through list of generated databuffers for uiBuffer */
-    ALBuf = Context->Device->Databuffers;
+    ALBuf = Context->Device->DatabufferList;
     while(ALBuf && ALBuf->databuffer != uiBuffer)
         ALBuf = ALBuf->next;
 
@@ -619,7 +619,7 @@ ALvoid ReleaseALDatabuffers(ALCdevice *device)
     ALdatabuffer *ALBuffer;
     ALdatabuffer *ALBufferTemp;
 
-    ALBuffer = device->Databuffers;
+    ALBuffer = device->DatabufferList;
     while(ALBuffer)
     {
         // Release sample data
@@ -631,6 +631,6 @@ ALvoid ReleaseALDatabuffers(ALCdevice *device)
         memset(ALBufferTemp, 0, sizeof(ALdatabuffer));
         free(ALBufferTemp);
     }
-    device->Databuffers = NULL;
+    device->DatabufferList = NULL;
     device->DatabufferCount = 0;
 }
diff --git a/OpenAL32/alListener.c b/OpenAL32/alListener.c
index 303d2f93..6a9ee65d 100644
--- a/OpenAL32/alListener.c
+++ b/OpenAL32/alListener.c
@@ -65,7 +65,7 @@ ALAPI ALvoid ALAPIENTRY alListenerf(ALenum eParam, ALfloat flValue)
     // relative sources are affected
     if(updateAll)
     {
-        ALsource *source = pContext->Source;
+        ALsource *source = pContext->SourceList;
         while(source)
         {
             source->NeedsUpdate = AL_TRUE;
@@ -108,7 +108,7 @@ ALAPI ALvoid ALAPIENTRY alListener3f(ALenum eParam, ALfloat flValue1, ALfloat fl
 
     if(updateWorld)
     {
-        ALsource *source = pContext->Source;
+        ALsource *source = pContext->SourceList;
         while(source)
         {
             if(!source->bHeadRelative)
@@ -164,7 +164,7 @@ ALAPI ALvoid ALAPIENTRY alListenerfv(ALenum eParam, const ALfloat *pflValues)
 
     if(updateWorld)
     {
-        ALsource *source = pContext->Source;
+        ALsource *source = pContext->SourceList;
         while(source)
         {
             if(!source->bHeadRelative)
diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c
index e7c51a66..3f6c80c4 100644
--- a/OpenAL32/alSource.c
+++ b/OpenAL32/alSource.c
@@ -56,7 +56,7 @@ ALAPI ALvoid ALAPIENTRY alGenSources(ALsizei n,ALuint *sources)
             // Check that the requested number of sources can be generated
             if((Context->SourceCount + n) <= Device->MaxNoOfSources)
             {
-                ALsource **list = &Context->Source;
+                ALsource **list = &Context->SourceList;
                 while(*list)
                     list = &(*list)->next;
 
@@ -161,7 +161,7 @@ ALAPI ALvoid ALAPIENTRY alDeleteSources(ALsizei n, const ALuint *sources)
                     Context->SourceCount--;
 
                     // Remove Source from list of Sources
-                    list = &Context->Source;
+                    list = &Context->SourceList;
                     while(*list && *list != ALSource)
                         list = &(*list)->next;
 
@@ -192,7 +192,7 @@ ALAPI ALboolean ALAPIENTRY alIsSource(ALuint source)
     if(!Context) return AL_FALSE;
 
     // To determine if this is a valid Source name, look through the list of generated Sources
-    Source = Context->Source;
+    Source = Context->SourceList;
     while(Source)
     {
         if(Source->source == source)
@@ -2137,10 +2137,10 @@ ALvoid ReleaseALSources(ALCcontext *Context)
 {
     ALuint j;
 
-    while(Context->Source)
+    while(Context->SourceList)
     {
-        ALsource *temp = Context->Source;
-        Context->Source = temp->next;
+        ALsource *temp = Context->SourceList;
+        Context->SourceList = temp->next;
 
         // For each buffer in the source's queue, decrement its reference counter and remove it
         while(temp->queue != NULL)
diff --git a/OpenAL32/alState.c b/OpenAL32/alState.c
index 9b17045e..32d86f35 100644
--- a/OpenAL32/alState.c
+++ b/OpenAL32/alState.c
@@ -63,7 +63,7 @@ ALAPI ALvoid ALAPIENTRY alEnable(ALenum capability)
 
     if(updateSources)
     {
-        ALsource *source = Context->Source;
+        ALsource *source = Context->SourceList;
         while(source)
         {
             source->NeedsUpdate = AL_TRUE;
@@ -96,7 +96,7 @@ ALAPI ALvoid ALAPIENTRY alDisable(ALenum capability)
 
     if(updateSources)
     {
-        ALsource *source = Context->Source;
+        ALsource *source = Context->SourceList;
         while(source)
         {
             source->NeedsUpdate = AL_TRUE;
@@ -552,7 +552,7 @@ ALAPI ALvoid ALAPIENTRY alDopplerFactor(ALfloat value)
     // relative sources are affected
     if(updateSources)
     {
-        ALsource *source = Context->Source;
+        ALsource *source = Context->SourceList;
         while(source)
         {
             source->NeedsUpdate = AL_TRUE;
@@ -581,7 +581,7 @@ ALAPI ALvoid ALAPIENTRY alDopplerVelocity(ALfloat value)
 
     if(updateSources)
     {
-        ALsource *source = Context->Source;
+        ALsource *source = Context->SourceList;
         while(source)
         {
             source->NeedsUpdate = AL_TRUE;
@@ -610,7 +610,7 @@ ALAPI ALvoid ALAPIENTRY alSpeedOfSound(ALfloat flSpeedOfSound)
 
     if(updateSources)
     {
-        ALsource *source = pContext->Source;
+        ALsource *source = pContext->SourceList;
         while(source)
         {
             source->NeedsUpdate = AL_TRUE;
@@ -649,7 +649,7 @@ ALAPI ALvoid ALAPIENTRY alDistanceModel(ALenum value)
 
     if(updateSources)
     {
-        ALsource *source = Context->Source;
+        ALsource *source = Context->SourceList;
         while(source)
         {
             source->NeedsUpdate = AL_TRUE;