aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2009-10-07 04:32:14 -0700
committerChris Robinson <[email protected]>2009-10-07 04:32:14 -0700
commitd6e439244ae00a1750f0dc8b249f47efb4967a23 (patch)
tree1be001719e7c57ccab24b2645eaa73f431eb1760
parent5ff225fa1ba2827ef32884b5890bcfb35168527a (diff)
Rename SetALCError for consistency
-rw-r--r--Alc/ALc.c106
-rw-r--r--Alc/alsa.c2
-rw-r--r--Alc/dsound.c2
-rw-r--r--Alc/oss.c2
-rw-r--r--Alc/pulseaudio.c2
-rw-r--r--Alc/winmm.c4
-rw-r--r--OpenAL32/Include/alMain.h2
7 files changed, 60 insertions, 60 deletions
diff --git a/Alc/ALc.c b/Alc/ALc.c
index 6201ff5f..c969fd95 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -453,11 +453,11 @@ static ALCboolean IsContext(ALCcontext *pContext)
/*
- SetALCError
+ alcSetError
Store latest ALC Error
*/
-ALCvoid SetALCError(ALenum errorCode)
+ALCvoid alcSetError(ALenum errorCode)
{
g_eLastContextError = errorCode;
}
@@ -589,7 +589,7 @@ ALCAPI ALCdevice* ALCAPIENTRY alcCaptureOpenDevice(const ALCchar *deviceName, AL
if(SampleSize <= 0)
{
- SetALCError(ALC_INVALID_VALUE);
+ alcSetError(ALC_INVALID_VALUE);
return NULL;
}
@@ -631,13 +631,13 @@ ALCAPI ALCdevice* ALCAPIENTRY alcCaptureOpenDevice(const ALCchar *deviceName, AL
if(!DeviceFound)
{
- SetALCError(ALC_INVALID_VALUE);
+ alcSetError(ALC_INVALID_VALUE);
free(pDevice);
pDevice = NULL;
}
}
else
- SetALCError(ALC_OUT_OF_MEMORY);
+ alcSetError(ALC_OUT_OF_MEMORY);
return pDevice;
}
@@ -668,7 +668,7 @@ ALCAPI ALCboolean ALCAPIENTRY alcCaptureCloseDevice(ALCdevice *pDevice)
bReturn = ALC_TRUE;
}
else
- SetALCError(ALC_INVALID_DEVICE);
+ alcSetError(ALC_INVALID_DEVICE);
return bReturn;
}
@@ -678,7 +678,7 @@ ALCAPI void ALCAPIENTRY alcCaptureStart(ALCdevice *pDevice)
if(IsDevice(pDevice) && pDevice->IsCaptureDevice)
ALCdevice_StartCapture(pDevice);
else
- SetALCError(ALC_INVALID_DEVICE);
+ alcSetError(ALC_INVALID_DEVICE);
}
ALCAPI void ALCAPIENTRY alcCaptureStop(ALCdevice *pDevice)
@@ -686,7 +686,7 @@ ALCAPI void ALCAPIENTRY alcCaptureStop(ALCdevice *pDevice)
if(IsDevice(pDevice) && pDevice->IsCaptureDevice)
ALCdevice_StopCapture(pDevice);
else
- SetALCError(ALC_INVALID_DEVICE);
+ alcSetError(ALC_INVALID_DEVICE);
}
ALCAPI void ALCAPIENTRY alcCaptureSamples(ALCdevice *pDevice, ALCvoid *pBuffer, ALCsizei lSamples)
@@ -694,7 +694,7 @@ ALCAPI void ALCAPIENTRY alcCaptureSamples(ALCdevice *pDevice, ALCvoid *pBuffer,
if(IsDevice(pDevice) && pDevice->IsCaptureDevice)
ALCdevice_CaptureSamples(pDevice, pBuffer, lSamples);
else
- SetALCError(ALC_INVALID_DEVICE);
+ alcSetError(ALC_INVALID_DEVICE);
}
/*
@@ -803,7 +803,7 @@ ALCAPI const ALCchar* ALCAPIENTRY alcGetString(ALCdevice *pDevice,ALCenum param)
free(alcDefaultDeviceSpecifier);
alcDefaultDeviceSpecifier = strdup(alcDeviceList ? alcDeviceList : "");
if(!alcDefaultDeviceSpecifier)
- SetALCError(ALC_OUT_OF_MEMORY);
+ alcSetError(ALC_OUT_OF_MEMORY);
value = alcDefaultDeviceSpecifier;
break;
@@ -812,7 +812,7 @@ ALCAPI const ALCchar* ALCAPIENTRY alcGetString(ALCdevice *pDevice,ALCenum param)
alcDefaultAllDeviceSpecifier = strdup(alcAllDeviceList ?
alcAllDeviceList : "");
if(!alcDefaultAllDeviceSpecifier)
- SetALCError(ALC_OUT_OF_MEMORY);
+ alcSetError(ALC_OUT_OF_MEMORY);
value = alcDefaultAllDeviceSpecifier;
break;
@@ -821,7 +821,7 @@ ALCAPI const ALCchar* ALCAPIENTRY alcGetString(ALCdevice *pDevice,ALCenum param)
alcCaptureDefaultDeviceSpecifier = strdup(alcCaptureDeviceList ?
alcCaptureDeviceList : "");
if(!alcCaptureDefaultDeviceSpecifier)
- SetALCError(ALC_OUT_OF_MEMORY);
+ alcSetError(ALC_OUT_OF_MEMORY);
value = alcCaptureDefaultDeviceSpecifier;
break;
@@ -830,7 +830,7 @@ ALCAPI const ALCchar* ALCAPIENTRY alcGetString(ALCdevice *pDevice,ALCenum param)
break;
default:
- SetALCError(ALC_INVALID_ENUM);
+ alcSetError(ALC_INVALID_ENUM);
break;
}
@@ -856,18 +856,18 @@ ALCAPI ALCvoid ALCAPIENTRY alcGetIntegerv(ALCdevice *device,ALCenum param,ALsize
if ((size) && (data))
*data = ALCdevice_AvailableSamples(device);
else
- SetALCError(ALC_INVALID_VALUE);
+ alcSetError(ALC_INVALID_VALUE);
break;
case ALC_CONNECTED:
if(size <= 0)
- SetALCError(ALC_INVALID_VALUE);
+ alcSetError(ALC_INVALID_VALUE);
else
*data = device->Connected;
break;
default:
- SetALCError(ALC_INVALID_ENUM);
+ alcSetError(ALC_INVALID_ENUM);
break;
}
@@ -882,53 +882,53 @@ ALCAPI ALCvoid ALCAPIENTRY alcGetIntegerv(ALCdevice *device,ALCenum param,ALsize
{
case ALC_MAJOR_VERSION:
if(size <= 0)
- SetALCError(ALC_INVALID_VALUE);
+ alcSetError(ALC_INVALID_VALUE);
else
*data = alcMajorVersion;
break;
case ALC_MINOR_VERSION:
if(size <= 0)
- SetALCError(ALC_INVALID_VALUE);
+ alcSetError(ALC_INVALID_VALUE);
else
*data = alcMinorVersion;
break;
case ALC_EFX_MAJOR_VERSION:
if(size <= 0)
- SetALCError(ALC_INVALID_VALUE);
+ alcSetError(ALC_INVALID_VALUE);
else
*data = alcEFXMajorVersion;
break;
case ALC_EFX_MINOR_VERSION:
if(size <= 0)
- SetALCError(ALC_INVALID_VALUE);
+ alcSetError(ALC_INVALID_VALUE);
else
*data = alcEFXMinorVersion;
break;
case ALC_MAX_AUXILIARY_SENDS:
if(size <= 0)
- SetALCError(ALC_INVALID_VALUE);
+ alcSetError(ALC_INVALID_VALUE);
else
*data = (device?device->NumAuxSends:MAX_SENDS);
break;
case ALC_ATTRIBUTES_SIZE:
if(!IsDevice(device))
- SetALCError(ALC_INVALID_DEVICE);
+ alcSetError(ALC_INVALID_DEVICE);
else if(size <= 0)
- SetALCError(ALC_INVALID_VALUE);
+ alcSetError(ALC_INVALID_VALUE);
else
*data = 13;
break;
case ALC_ALL_ATTRIBUTES:
if(!IsDevice(device))
- SetALCError(ALC_INVALID_DEVICE);
+ alcSetError(ALC_INVALID_DEVICE);
else if (size < 13)
- SetALCError(ALC_INVALID_VALUE);
+ alcSetError(ALC_INVALID_VALUE);
else
{
int i = 0;
@@ -959,65 +959,65 @@ ALCAPI ALCvoid ALCAPIENTRY alcGetIntegerv(ALCdevice *device,ALCenum param,ALsize
case ALC_FREQUENCY:
if(!IsDevice(device))
- SetALCError(ALC_INVALID_DEVICE);
+ alcSetError(ALC_INVALID_DEVICE);
else if(size <= 0)
- SetALCError(ALC_INVALID_VALUE);
+ alcSetError(ALC_INVALID_VALUE);
else
*data = device->Frequency;
break;
case ALC_REFRESH:
if(!IsDevice(device))
- SetALCError(ALC_INVALID_DEVICE);
+ alcSetError(ALC_INVALID_DEVICE);
else if(size <= 0)
- SetALCError(ALC_INVALID_VALUE);
+ alcSetError(ALC_INVALID_VALUE);
else
*data = device->Frequency / device->UpdateSize;
break;
case ALC_SYNC:
if(!IsDevice(device))
- SetALCError(ALC_INVALID_DEVICE);
+ alcSetError(ALC_INVALID_DEVICE);
else if(size <= 0)
- SetALCError(ALC_INVALID_VALUE);
+ alcSetError(ALC_INVALID_VALUE);
else
*data = ALC_FALSE;
break;
case ALC_MONO_SOURCES:
if(!IsDevice(device))
- SetALCError(ALC_INVALID_DEVICE);
+ alcSetError(ALC_INVALID_DEVICE);
else if(size <= 0)
- SetALCError(ALC_INVALID_VALUE);
+ alcSetError(ALC_INVALID_VALUE);
else
*data = device->lNumMonoSources;
break;
case ALC_STEREO_SOURCES:
if(!IsDevice(device))
- SetALCError(ALC_INVALID_DEVICE);
+ alcSetError(ALC_INVALID_DEVICE);
else if(size <= 0)
- SetALCError(ALC_INVALID_VALUE);
+ alcSetError(ALC_INVALID_VALUE);
else
*data = device->lNumStereoSources;
break;
case ALC_CONNECTED:
if(!IsDevice(device))
- SetALCError(ALC_INVALID_DEVICE);
+ alcSetError(ALC_INVALID_DEVICE);
else if(size <= 0)
- SetALCError(ALC_INVALID_VALUE);
+ alcSetError(ALC_INVALID_VALUE);
else
*data = device->Connected;
break;
default:
- SetALCError(ALC_INVALID_ENUM);
+ alcSetError(ALC_INVALID_ENUM);
break;
}
}
else if(size)
- SetALCError(ALC_INVALID_VALUE);
+ alcSetError(ALC_INVALID_VALUE);
}
return;
@@ -1059,7 +1059,7 @@ ALCAPI ALCboolean ALCAPIENTRY alcIsExtensionPresent(ALCdevice *device, const ALC
}
}
else
- SetALCError(ALC_INVALID_VALUE);
+ alcSetError(ALC_INVALID_VALUE);
return bResult;
}
@@ -1085,7 +1085,7 @@ ALCAPI ALCvoid * ALCAPIENTRY alcGetProcAddress(ALCdevice *device, const ALCchar
pFunction = alcFunctions[i].address;
}
else
- SetALCError(ALC_INVALID_VALUE);
+ alcSetError(ALC_INVALID_VALUE);
return pFunction;
}
@@ -1108,7 +1108,7 @@ ALCAPI ALCenum ALCAPIENTRY alcGetEnumValue(ALCdevice *device, const ALCchar *enu
val = enumeration[i].value;
if(!enumeration[i].enumName)
- SetALCError(ALC_INVALID_VALUE);
+ alcSetError(ALC_INVALID_VALUE);
return val;
}
@@ -1128,7 +1128,7 @@ ALCAPI ALCcontext* ALCAPIENTRY alcCreateContext(ALCdevice *device, const ALCint
if(!IsDevice(device) || device->IsCaptureDevice || !device->Connected)
{
- SetALCError(ALC_INVALID_DEVICE);
+ alcSetError(ALC_INVALID_DEVICE);
ProcessContext(NULL);
return NULL;
}
@@ -1139,7 +1139,7 @@ ALCAPI ALCcontext* ALCAPIENTRY alcCreateContext(ALCdevice *device, const ALCint
// Current implementation only allows one Context per Device
if(device->Context)
{
- SetALCError(ALC_INVALID_VALUE);
+ alcSetError(ALC_INVALID_VALUE);
ProcessContext(NULL);
return NULL;
}
@@ -1192,7 +1192,7 @@ ALCAPI ALCcontext* ALCAPIENTRY alcCreateContext(ALCdevice *device, const ALCint
if(ALCdevice_ResetPlayback(device) == ALC_FALSE)
{
- SetALCError(ALC_INVALID_DEVICE);
+ alcSetError(ALC_INVALID_DEVICE);
aluHandleDisconnect(device);
ProcessContext(NULL);
return NULL;
@@ -1217,7 +1217,7 @@ ALCAPI ALCcontext* ALCAPIENTRY alcCreateContext(ALCdevice *device, const ALCint
ALContext = calloc(1, sizeof(ALCcontext));
if(!ALContext)
{
- SetALCError(ALC_OUT_OF_MEMORY);
+ alcSetError(ALC_OUT_OF_MEMORY);
ProcessContext(NULL);
return NULL;
}
@@ -1287,7 +1287,7 @@ ALCAPI ALCvoid ALCAPIENTRY alcDestroyContext(ALCcontext *context)
free(context);
}
else
- SetALCError(ALC_INVALID_CONTEXT);
+ alcSetError(ALC_INVALID_CONTEXT);
}
@@ -1343,7 +1343,7 @@ ALCAPI ALCdevice* ALCAPIENTRY alcGetContextsDevice(ALCcontext *pContext)
if (IsContext(pContext))
pDevice = pContext->Device;
else
- SetALCError(ALC_INVALID_CONTEXT);
+ alcSetError(ALC_INVALID_CONTEXT);
ProcessContext(NULL);
return pDevice;
@@ -1382,7 +1382,7 @@ ALCAPI ALCboolean ALCAPIENTRY alcMakeContextCurrent(ALCcontext *context)
}
else
{
- SetALCError(ALC_INVALID_CONTEXT);
+ alcSetError(ALC_INVALID_CONTEXT);
bReturn = AL_FALSE;
}
@@ -1407,7 +1407,7 @@ ALCboolean ALCAPIENTRY alcMakeCurrent(ALCcontext *context)
tls_set(LocalContext, context);
else
{
- SetALCError(ALC_INVALID_CONTEXT);
+ alcSetError(ALC_INVALID_CONTEXT);
bReturn = AL_FALSE;
}
@@ -1529,13 +1529,13 @@ ALCAPI ALCdevice* ALCAPIENTRY alcOpenDevice(const ALCchar *deviceName)
if (!bDeviceFound)
{
// No suitable output device found
- SetALCError(ALC_INVALID_VALUE);
+ alcSetError(ALC_INVALID_VALUE);
free(device);
device = NULL;
}
}
else
- SetALCError(ALC_OUT_OF_MEMORY);
+ alcSetError(ALC_OUT_OF_MEMORY);
return device;
}
@@ -1614,7 +1614,7 @@ ALCAPI ALCboolean ALCAPIENTRY alcCloseDevice(ALCdevice *pDevice)
bReturn = ALC_TRUE;
}
else
- SetALCError(ALC_INVALID_DEVICE);
+ alcSetError(ALC_INVALID_DEVICE);
return bReturn;
}
diff --git a/Alc/alsa.c b/Alc/alsa.c
index bb732fe7..24d96ba1 100644
--- a/Alc/alsa.c
+++ b/Alc/alsa.c
@@ -883,7 +883,7 @@ static void alsa_capture_samples(ALCdevice *pDevice, ALCvoid *pBuffer, ALCuint l
if(lSamples <= (ALCuint)RingBufferSize(data->ring))
ReadRingBuffer(data->ring, pBuffer, lSamples);
else
- SetALCError(ALC_INVALID_VALUE);
+ alcSetError(ALC_INVALID_VALUE);
}
static ALCuint alsa_available_samples(ALCdevice *pDevice)
diff --git a/Alc/dsound.c b/Alc/dsound.c
index 91ac6499..111183f3 100644
--- a/Alc/dsound.c
+++ b/Alc/dsound.c
@@ -230,7 +230,7 @@ static ALCboolean DSoundOpenPlayback(ALCdevice *device, const ALCchar *deviceNam
pData = calloc(1, sizeof(DSoundData));
if(!pData)
{
- SetALCError(ALC_OUT_OF_MEMORY);
+ alcSetError(ALC_OUT_OF_MEMORY);
DSoundUnload();
return ALC_FALSE;
}
diff --git a/Alc/oss.c b/Alc/oss.c
index 62d3c1df..6d004920 100644
--- a/Alc/oss.c
+++ b/Alc/oss.c
@@ -445,7 +445,7 @@ static void oss_capture_samples(ALCdevice *pDevice, ALCvoid *pBuffer, ALCuint lS
if(lSamples <= (ALCuint)RingBufferSize(data->ring))
ReadRingBuffer(data->ring, pBuffer, lSamples);
else
- SetALCError(ALC_INVALID_VALUE);
+ alcSetError(ALC_INVALID_VALUE);
}
static ALCuint oss_available_samples(ALCdevice *pDevice)
diff --git a/Alc/pulseaudio.c b/Alc/pulseaudio.c
index bfea9947..d5dcf1df 100644
--- a/Alc/pulseaudio.c
+++ b/Alc/pulseaudio.c
@@ -656,7 +656,7 @@ static void pulse_capture_samples(ALCdevice *device, ALCvoid *buffer, ALCuint sa
ALCuint available = RingBufferSize(data->ring);
if(available < samples)
- SetALCError(ALC_INVALID_VALUE);
+ alcSetError(ALC_INVALID_VALUE);
else
ReadRingBuffer(data->ring, buffer, samples);
} //}}}
diff --git a/Alc/winmm.c b/Alc/winmm.c
index 5ecf471f..bf3c1887 100644
--- a/Alc/winmm.c
+++ b/Alc/winmm.c
@@ -202,7 +202,7 @@ static ALCboolean WinMMOpenCapture(ALCdevice *pDevice, const ALCchar *deviceName
pData = calloc(1, sizeof(*pData));
if(!pData)
{
- SetALCError(ALC_OUT_OF_MEMORY);
+ alcSetError(ALC_OUT_OF_MEMORY);
return ALC_FALSE;
}
@@ -373,7 +373,7 @@ static void WinMMCaptureSamples(ALCdevice *pDevice, ALCvoid *pBuffer, ALCuint lS
frameSize;
if(ulSamples > ulCapturedSamples)
{
- SetALCError(ALC_INVALID_VALUE);
+ alcSetError(ALC_INVALID_VALUE);
return;
}
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index a334fabd..b02f9f83 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -305,7 +305,7 @@ void AppendDeviceList(const ALCchar *name);
void AppendAllDeviceList(const ALCchar *name);
void AppendCaptureDeviceList(const ALCchar *name);
-ALCvoid SetALCError(ALenum errorCode);
+ALCvoid alcSetError(ALenum errorCode);
ALCvoid SuspendContext(ALCcontext *context);
ALCvoid ProcessContext(ALCcontext *context);