aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Alc/ALc.c6
-rw-r--r--OpenAL32/Include/alMain.h2
-rw-r--r--OpenAL32/alAuxEffectSlot.c6
-rw-r--r--OpenAL32/alBuffer.c2
-rw-r--r--OpenAL32/alEffect.c2
-rw-r--r--OpenAL32/alError.c4
-rw-r--r--OpenAL32/alFilter.c2
-rw-r--r--OpenAL32/alSource.c6
-rw-r--r--OpenAL32/alState.c4
9 files changed, 17 insertions, 17 deletions
diff --git a/Alc/ALc.c b/Alc/ALc.c
index ae5a0830..886a38b0 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -1431,12 +1431,12 @@ ALCcontext *GetLockedContext(void)
}
/*
- * GetReffedContext(void)
+ * GetContextRef
*
- * Returns the currently active Context, and add a reference to it without
+ * Returns the currently active Context, and adds a reference to it without
* locking
*/
-ALCcontext *GetReffedContext(void)
+ALCcontext *GetContextRef(void)
{
ALCcontext *context;
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index c712a38b..faac3029 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -639,7 +639,7 @@ ALvoid *StartThread(ALuint (*func)(ALvoid*), ALvoid *ptr);
ALuint StopThread(ALvoid *thread);
ALCcontext *GetLockedContext(void);
-ALCcontext *GetReffedContext(void);
+ALCcontext *GetContextRef(void);
typedef struct RingBuffer RingBuffer;
RingBuffer *CreateRingBuffer(ALsizei frame_size, ALsizei length);
diff --git a/OpenAL32/alAuxEffectSlot.c b/OpenAL32/alAuxEffectSlot.c
index 88645163..06eb629f 100644
--- a/OpenAL32/alAuxEffectSlot.c
+++ b/OpenAL32/alAuxEffectSlot.c
@@ -45,7 +45,7 @@ AL_API ALvoid AL_APIENTRY alGenAuxiliaryEffectSlots(ALsizei n, ALuint *effectslo
ALCcontext *Context;
ALCdevice *Device;
- Context = GetReffedContext();
+ Context = GetContextRef();
if(!Context) return;
Device = Context->Device;
@@ -123,7 +123,7 @@ AL_API ALvoid AL_APIENTRY alDeleteAuxiliaryEffectSlots(ALsizei n, ALuint *effect
ALeffectslot *EffectSlot;
ALsizei i;
- Context = GetReffedContext();
+ Context = GetContextRef();
if(!Context) return;
if(n < 0)
@@ -173,7 +173,7 @@ AL_API ALboolean AL_APIENTRY alIsAuxiliaryEffectSlot(ALuint effectslot)
ALCcontext *Context;
ALboolean result;
- Context = GetReffedContext();
+ Context = GetContextRef();
if(!Context) return AL_FALSE;
result = (LookupEffectSlot(Context->EffectSlotMap, effectslot) ?
diff --git a/OpenAL32/alBuffer.c b/OpenAL32/alBuffer.c
index dde7f0af..d76fa677 100644
--- a/OpenAL32/alBuffer.c
+++ b/OpenAL32/alBuffer.c
@@ -265,7 +265,7 @@ AL_API ALboolean AL_APIENTRY alIsBuffer(ALuint buffer)
ALCcontext *Context;
ALboolean result;
- Context = GetReffedContext();
+ Context = GetContextRef();
if(!Context) return AL_FALSE;
result = ((!buffer || LookupBuffer(Context->Device->BufferMap, buffer)) ?
diff --git a/OpenAL32/alEffect.c b/OpenAL32/alEffect.c
index 3bd689a8..c79db1fa 100644
--- a/OpenAL32/alEffect.c
+++ b/OpenAL32/alEffect.c
@@ -143,7 +143,7 @@ AL_API ALboolean AL_APIENTRY alIsEffect(ALuint effect)
ALCcontext *Context;
ALboolean result;
- Context = GetReffedContext();
+ Context = GetContextRef();
if(!Context) return AL_FALSE;
result = ((!effect || LookupEffect(Context->Device->EffectMap, effect)) ?
diff --git a/OpenAL32/alError.c b/OpenAL32/alError.c
index 88e284b0..29d06027 100644
--- a/OpenAL32/alError.c
+++ b/OpenAL32/alError.c
@@ -24,12 +24,12 @@
#include "AL/alc.h"
#include "alError.h"
-AL_API ALenum AL_APIENTRY alGetError(ALvoid)
+AL_API ALenum AL_APIENTRY alGetError(void)
{
ALCcontext *Context;
ALenum errorCode;
- Context = GetReffedContext();
+ Context = GetContextRef();
if(!Context) return AL_INVALID_OPERATION;
errorCode = ExchangeInt(&Context->LastError, AL_NO_ERROR);
diff --git a/OpenAL32/alFilter.c b/OpenAL32/alFilter.c
index 6b3f8620..a1a810fb 100644
--- a/OpenAL32/alFilter.c
+++ b/OpenAL32/alFilter.c
@@ -139,7 +139,7 @@ AL_API ALboolean AL_APIENTRY alIsFilter(ALuint filter)
ALCcontext *Context;
ALboolean result;
- Context = GetReffedContext();
+ Context = GetContextRef();
if(!Context) return AL_FALSE;
result = ((!filter || LookupFilter(Context->Device->FilterMap, filter)) ?
diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c
index 2fc28e53..93000472 100644
--- a/OpenAL32/alSource.c
+++ b/OpenAL32/alSource.c
@@ -61,7 +61,7 @@ AL_API ALvoid AL_APIENTRY alGenSources(ALsizei n,ALuint *sources)
ALCcontext *Context;
ALCdevice *Device;
- Context = GetReffedContext();
+ Context = GetContextRef();
if(!Context) return;
Device = Context->Device;
@@ -114,7 +114,7 @@ AL_API ALvoid AL_APIENTRY alDeleteSources(ALsizei n, const ALuint *sources)
ALsizei i, j;
ALbufferlistitem *BufferList;
- Context = GetReffedContext();
+ Context = GetContextRef();
if(!Context) return;
if(n < 0)
@@ -190,7 +190,7 @@ AL_API ALboolean AL_APIENTRY alIsSource(ALuint source)
ALCcontext *Context;
ALboolean result;
- Context = GetReffedContext();
+ Context = GetContextRef();
if(!Context) return AL_FALSE;
result = (LookupSource(Context->SourceMap, source) ? AL_TRUE : AL_FALSE);
diff --git a/OpenAL32/alState.c b/OpenAL32/alState.c
index 297250bd..dc88263e 100644
--- a/OpenAL32/alState.c
+++ b/OpenAL32/alState.c
@@ -577,7 +577,7 @@ AL_API ALvoid AL_APIENTRY alDeferUpdatesSOFT(void)
{
ALCcontext *Context;
- Context = GetReffedContext();
+ Context = GetContextRef();
if(!Context) return;
if(!Context->DeferUpdates)
@@ -628,7 +628,7 @@ AL_API ALvoid AL_APIENTRY alProcessUpdatesSOFT(void)
{
ALCcontext *Context;
- Context = GetReffedContext();
+ Context = GetContextRef();
if(!Context) return;
if(ExchangeInt(&Context->DeferUpdates, AL_FALSE))