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

Rename SetALCError for consistency

Browse Source
This commit is contained in:
Chris Robinson 2009-10-07 04:32:14 -07:00
parent 5ff225fa1b
commit d6e439244a
7 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
Alc/ALc.c
View File

@ -453,11 +453,11 @@ static ALCboolean IsContext(ALCcontext *pContext)
/* /*
SetALCError alcSetError
Store latest ALC Error Store latest ALC Error
*/ */
ALCvoid SetALCError(ALenum errorCode) ALCvoid alcSetError(ALenum errorCode)
{ {
g_eLastContextError = errorCode; g_eLastContextError = errorCode;
} }
@ -589,7 +589,7 @@ ALCAPI ALCdevice* ALCAPIENTRY alcCaptureOpenDevice(const ALCchar *deviceName, AL
if(SampleSize <= 0) if(SampleSize <= 0)
{ {
SetALCError(ALC_INVALID_VALUE); alcSetError(ALC_INVALID_VALUE);
return NULL; return NULL;
} }
@ -631,13 +631,13 @@ ALCAPI ALCdevice* ALCAPIENTRY alcCaptureOpenDevice(const ALCchar *deviceName, AL
if(!DeviceFound) if(!DeviceFound)
{ {
SetALCError(ALC_INVALID_VALUE); alcSetError(ALC_INVALID_VALUE);
free(pDevice); free(pDevice);
pDevice = NULL; pDevice = NULL;
} }
} }
else else
SetALCError(ALC_OUT_OF_MEMORY); alcSetError(ALC_OUT_OF_MEMORY);
return pDevice; return pDevice;
} }
@ -668,7 +668,7 @@ ALCAPI ALCboolean ALCAPIENTRY alcCaptureCloseDevice(ALCdevice *pDevice)
bReturn = ALC_TRUE; bReturn = ALC_TRUE;
} }
else else
SetALCError(ALC_INVALID_DEVICE); alcSetError(ALC_INVALID_DEVICE);
return bReturn; return bReturn;
} }
@ -678,7 +678,7 @@ ALCAPI void ALCAPIENTRY alcCaptureStart(ALCdevice *pDevice)
if(IsDevice(pDevice) && pDevice->IsCaptureDevice) if(IsDevice(pDevice) && pDevice->IsCaptureDevice)
ALCdevice_StartCapture(pDevice); ALCdevice_StartCapture(pDevice);
else else
SetALCError(ALC_INVALID_DEVICE); alcSetError(ALC_INVALID_DEVICE);
} }
ALCAPI void ALCAPIENTRY alcCaptureStop(ALCdevice *pDevice) ALCAPI void ALCAPIENTRY alcCaptureStop(ALCdevice *pDevice)
@ -686,7 +686,7 @@ ALCAPI void ALCAPIENTRY alcCaptureStop(ALCdevice *pDevice)
if(IsDevice(pDevice) && pDevice->IsCaptureDevice) if(IsDevice(pDevice) && pDevice->IsCaptureDevice)
ALCdevice_StopCapture(pDevice); ALCdevice_StopCapture(pDevice);
else else
SetALCError(ALC_INVALID_DEVICE); alcSetError(ALC_INVALID_DEVICE);
} }
ALCAPI void ALCAPIENTRY alcCaptureSamples(ALCdevice *pDevice, ALCvoid *pBuffer, ALCsizei lSamples) 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) if(IsDevice(pDevice) && pDevice->IsCaptureDevice)
ALCdevice_CaptureSamples(pDevice, pBuffer, lSamples); ALCdevice_CaptureSamples(pDevice, pBuffer, lSamples);
else else
SetALCError(ALC_INVALID_DEVICE); alcSetError(ALC_INVALID_DEVICE);
} }
/* /*
@ -803,7 +803,7 @@ ALCAPI const ALCchar* ALCAPIENTRY alcGetString(ALCdevice *pDevice,ALCenum param)
free(alcDefaultDeviceSpecifier); free(alcDefaultDeviceSpecifier);
alcDefaultDeviceSpecifier = strdup(alcDeviceList ? alcDeviceList : ""); alcDefaultDeviceSpecifier = strdup(alcDeviceList ? alcDeviceList : "");
if(!alcDefaultDeviceSpecifier) if(!alcDefaultDeviceSpecifier)
SetALCError(ALC_OUT_OF_MEMORY); alcSetError(ALC_OUT_OF_MEMORY);
value = alcDefaultDeviceSpecifier; value = alcDefaultDeviceSpecifier;
break; break;
@ -812,7 +812,7 @@ ALCAPI const ALCchar* ALCAPIENTRY alcGetString(ALCdevice *pDevice,ALCenum param)
alcDefaultAllDeviceSpecifier = strdup(alcAllDeviceList ? alcDefaultAllDeviceSpecifier = strdup(alcAllDeviceList ?
alcAllDeviceList : ""); alcAllDeviceList : "");
if(!alcDefaultAllDeviceSpecifier) if(!alcDefaultAllDeviceSpecifier)
SetALCError(ALC_OUT_OF_MEMORY); alcSetError(ALC_OUT_OF_MEMORY);
value = alcDefaultAllDeviceSpecifier; value = alcDefaultAllDeviceSpecifier;
break; break;
@ -821,7 +821,7 @@ ALCAPI const ALCchar* ALCAPIENTRY alcGetString(ALCdevice *pDevice,ALCenum param)
alcCaptureDefaultDeviceSpecifier = strdup(alcCaptureDeviceList ? alcCaptureDefaultDeviceSpecifier = strdup(alcCaptureDeviceList ?
alcCaptureDeviceList : ""); alcCaptureDeviceList : "");
if(!alcCaptureDefaultDeviceSpecifier) if(!alcCaptureDefaultDeviceSpecifier)
SetALCError(ALC_OUT_OF_MEMORY); alcSetError(ALC_OUT_OF_MEMORY);
value = alcCaptureDefaultDeviceSpecifier; value = alcCaptureDefaultDeviceSpecifier;
break; break;
@ -830,7 +830,7 @@ ALCAPI const ALCchar* ALCAPIENTRY alcGetString(ALCdevice *pDevice,ALCenum param)
break; break;
default: default:
SetALCError(ALC_INVALID_ENUM); alcSetError(ALC_INVALID_ENUM);
break; break;
} }
@ -856,18 +856,18 @@ ALCAPI ALCvoid ALCAPIENTRY alcGetIntegerv(ALCdevice *device,ALCenum param,ALsize
if ((size) && (data)) if ((size) && (data))
*data = ALCdevice_AvailableSamples(device); *data = ALCdevice_AvailableSamples(device);
else else
SetALCError(ALC_INVALID_VALUE); alcSetError(ALC_INVALID_VALUE);
break; break;
case ALC_CONNECTED: case ALC_CONNECTED:
if(size <= 0) if(size <= 0)
SetALCError(ALC_INVALID_VALUE); alcSetError(ALC_INVALID_VALUE);
else else
*data = device->Connected; *data = device->Connected;
break; break;
default: default:
SetALCError(ALC_INVALID_ENUM); alcSetError(ALC_INVALID_ENUM);
break; break;
} }
@ -882,53 +882,53 @@ ALCAPI ALCvoid ALCAPIENTRY alcGetIntegerv(ALCdevice *device,ALCenum param,ALsize
{ {
case ALC_MAJOR_VERSION: case ALC_MAJOR_VERSION:
if(size <= 0) if(size <= 0)
SetALCError(ALC_INVALID_VALUE); alcSetError(ALC_INVALID_VALUE);
else else
*data = alcMajorVersion; *data = alcMajorVersion;
break; break;
case ALC_MINOR_VERSION: case ALC_MINOR_VERSION:
if(size <= 0) if(size <= 0)
SetALCError(ALC_INVALID_VALUE); alcSetError(ALC_INVALID_VALUE);
else else
*data = alcMinorVersion; *data = alcMinorVersion;
break; break;
case ALC_EFX_MAJOR_VERSION: case ALC_EFX_MAJOR_VERSION:
if(size <= 0) if(size <= 0)
SetALCError(ALC_INVALID_VALUE); alcSetError(ALC_INVALID_VALUE);
else else
*data = alcEFXMajorVersion; *data = alcEFXMajorVersion;
break; break;
case ALC_EFX_MINOR_VERSION: case ALC_EFX_MINOR_VERSION:
if(size <= 0) if(size <= 0)
SetALCError(ALC_INVALID_VALUE); alcSetError(ALC_INVALID_VALUE);
else else
*data = alcEFXMinorVersion; *data = alcEFXMinorVersion;
break; break;
case ALC_MAX_AUXILIARY_SENDS: case ALC_MAX_AUXILIARY_SENDS:
if(size <= 0) if(size <= 0)
SetALCError(ALC_INVALID_VALUE); alcSetError(ALC_INVALID_VALUE);
else else
*data = (device?device->NumAuxSends:MAX_SENDS); *data = (device?device->NumAuxSends:MAX_SENDS);
break; break;
case ALC_ATTRIBUTES_SIZE: case ALC_ATTRIBUTES_SIZE:
if(!IsDevice(device)) if(!IsDevice(device))
SetALCError(ALC_INVALID_DEVICE); alcSetError(ALC_INVALID_DEVICE);
else if(size <= 0) else if(size <= 0)
SetALCError(ALC_INVALID_VALUE); alcSetError(ALC_INVALID_VALUE);
else else
*data = 13; *data = 13;
break; break;
case ALC_ALL_ATTRIBUTES: case ALC_ALL_ATTRIBUTES:
if(!IsDevice(device)) if(!IsDevice(device))
SetALCError(ALC_INVALID_DEVICE); alcSetError(ALC_INVALID_DEVICE);
else if (size < 13) else if (size < 13)
SetALCError(ALC_INVALID_VALUE); alcSetError(ALC_INVALID_VALUE);
else else
{ {
int i = 0; int i = 0;
@ -959,65 +959,65 @@ ALCAPI ALCvoid ALCAPIENTRY alcGetIntegerv(ALCdevice *device,ALCenum param,ALsize
case ALC_FREQUENCY: case ALC_FREQUENCY:
if(!IsDevice(device)) if(!IsDevice(device))
SetALCError(ALC_INVALID_DEVICE); alcSetError(ALC_INVALID_DEVICE);
else if(size <= 0) else if(size <= 0)
SetALCError(ALC_INVALID_VALUE); alcSetError(ALC_INVALID_VALUE);
else else
*data = device->Frequency; *data = device->Frequency;
break; break;
case ALC_REFRESH: case ALC_REFRESH:
if(!IsDevice(device)) if(!IsDevice(device))
SetALCError(ALC_INVALID_DEVICE); alcSetError(ALC_INVALID_DEVICE);
else if(size <= 0) else if(size <= 0)
SetALCError(ALC_INVALID_VALUE); alcSetError(ALC_INVALID_VALUE);
else else
*data = device->Frequency / device->UpdateSize; *data = device->Frequency / device->UpdateSize;
break; break;
case ALC_SYNC: case ALC_SYNC:
if(!IsDevice(device)) if(!IsDevice(device))
SetALCError(ALC_INVALID_DEVICE); alcSetError(ALC_INVALID_DEVICE);
else if(size <= 0) else if(size <= 0)
SetALCError(ALC_INVALID_VALUE); alcSetError(ALC_INVALID_VALUE);
else else
*data = ALC_FALSE; *data = ALC_FALSE;
break; break;
case ALC_MONO_SOURCES: case ALC_MONO_SOURCES:
if(!IsDevice(device)) if(!IsDevice(device))
SetALCError(ALC_INVALID_DEVICE); alcSetError(ALC_INVALID_DEVICE);
else if(size <= 0) else if(size <= 0)
SetALCError(ALC_INVALID_VALUE); alcSetError(ALC_INVALID_VALUE);
else else
*data = device->lNumMonoSources; *data = device->lNumMonoSources;
break; break;
case ALC_STEREO_SOURCES: case ALC_STEREO_SOURCES:
if(!IsDevice(device)) if(!IsDevice(device))
SetALCError(ALC_INVALID_DEVICE); alcSetError(ALC_INVALID_DEVICE);
else if(size <= 0) else if(size <= 0)
SetALCError(ALC_INVALID_VALUE); alcSetError(ALC_INVALID_VALUE);
else else
*data = device->lNumStereoSources; *data = device->lNumStereoSources;
break; break;
case ALC_CONNECTED: case ALC_CONNECTED:
if(!IsDevice(device)) if(!IsDevice(device))
SetALCError(ALC_INVALID_DEVICE); alcSetError(ALC_INVALID_DEVICE);
else if(size <= 0) else if(size <= 0)
SetALCError(ALC_INVALID_VALUE); alcSetError(ALC_INVALID_VALUE);
else else
*data = device->Connected; *data = device->Connected;
break; break;
default: default:
SetALCError(ALC_INVALID_ENUM); alcSetError(ALC_INVALID_ENUM);
break; break;
} }
} }
else if(size) else if(size)
SetALCError(ALC_INVALID_VALUE); alcSetError(ALC_INVALID_VALUE);
} }
return; return;
@ -1059,7 +1059,7 @@ ALCAPI ALCboolean ALCAPIENTRY alcIsExtensionPresent(ALCdevice *device, const ALC
} }
} }
else else
SetALCError(ALC_INVALID_VALUE); alcSetError(ALC_INVALID_VALUE);
return bResult; return bResult;
} }
@ -1085,7 +1085,7 @@ ALCAPI ALCvoid * ALCAPIENTRY alcGetProcAddress(ALCdevice *device, const ALCchar
pFunction = alcFunctions[i].address; pFunction = alcFunctions[i].address;
} }
else else
SetALCError(ALC_INVALID_VALUE); alcSetError(ALC_INVALID_VALUE);
return pFunction; return pFunction;
} }
@ -1108,7 +1108,7 @@ ALCAPI ALCenum ALCAPIENTRY alcGetEnumValue(ALCdevice *device, const ALCchar *enu
val = enumeration[i].value; val = enumeration[i].value;
if(!enumeration[i].enumName) if(!enumeration[i].enumName)
SetALCError(ALC_INVALID_VALUE); alcSetError(ALC_INVALID_VALUE);
return val; return val;
} }
@ -1128,7 +1128,7 @@ ALCAPI ALCcontext* ALCAPIENTRY alcCreateContext(ALCdevice *device, const ALCint
if(!IsDevice(device) || device->IsCaptureDevice || !device->Connected) if(!IsDevice(device) || device->IsCaptureDevice || !device->Connected)
{ {
SetALCError(ALC_INVALID_DEVICE); alcSetError(ALC_INVALID_DEVICE);
ProcessContext(NULL); ProcessContext(NULL);
return NULL; return NULL;
} }
@ -1139,7 +1139,7 @@ ALCAPI ALCcontext* ALCAPIENTRY alcCreateContext(ALCdevice *device, const ALCint
// Current implementation only allows one Context per Device // Current implementation only allows one Context per Device
if(device->Context) if(device->Context)
{ {
SetALCError(ALC_INVALID_VALUE); alcSetError(ALC_INVALID_VALUE);
ProcessContext(NULL); ProcessContext(NULL);
return NULL; return NULL;
} }
@ -1192,7 +1192,7 @@ ALCAPI ALCcontext* ALCAPIENTRY alcCreateContext(ALCdevice *device, const ALCint
if(ALCdevice_ResetPlayback(device) == ALC_FALSE) if(ALCdevice_ResetPlayback(device) == ALC_FALSE)
{ {
SetALCError(ALC_INVALID_DEVICE); alcSetError(ALC_INVALID_DEVICE);
aluHandleDisconnect(device); aluHandleDisconnect(device);
ProcessContext(NULL); ProcessContext(NULL);
return NULL; return NULL;
@ -1217,7 +1217,7 @@ ALCAPI ALCcontext* ALCAPIENTRY alcCreateContext(ALCdevice *device, const ALCint
ALContext = calloc(1, sizeof(ALCcontext)); ALContext = calloc(1, sizeof(ALCcontext));
if(!ALContext) if(!ALContext)
{ {
SetALCError(ALC_OUT_OF_MEMORY); alcSetError(ALC_OUT_OF_MEMORY);
ProcessContext(NULL); ProcessContext(NULL);
return NULL; return NULL;
} }
@ -1287,7 +1287,7 @@ ALCAPI ALCvoid ALCAPIENTRY alcDestroyContext(ALCcontext *context)
free(context); free(context);
} }
else else
SetALCError(ALC_INVALID_CONTEXT); alcSetError(ALC_INVALID_CONTEXT);
} }
@ -1343,7 +1343,7 @@ ALCAPI ALCdevice* ALCAPIENTRY alcGetContextsDevice(ALCcontext *pContext)
if (IsContext(pContext)) if (IsContext(pContext))
pDevice = pContext->Device; pDevice = pContext->Device;
else else
SetALCError(ALC_INVALID_CONTEXT); alcSetError(ALC_INVALID_CONTEXT);
ProcessContext(NULL); ProcessContext(NULL);
return pDevice; return pDevice;
@ -1382,7 +1382,7 @@ ALCAPI ALCboolean ALCAPIENTRY alcMakeContextCurrent(ALCcontext *context)
} }
else else
{ {
SetALCError(ALC_INVALID_CONTEXT); alcSetError(ALC_INVALID_CONTEXT);
bReturn = AL_FALSE; bReturn = AL_FALSE;
} }
@ -1407,7 +1407,7 @@ ALCboolean ALCAPIENTRY alcMakeCurrent(ALCcontext *context)
tls_set(LocalContext, context); tls_set(LocalContext, context);
else else
{ {
SetALCError(ALC_INVALID_CONTEXT); alcSetError(ALC_INVALID_CONTEXT);
bReturn = AL_FALSE; bReturn = AL_FALSE;
} }
@ -1529,13 +1529,13 @@ ALCAPI ALCdevice* ALCAPIENTRY alcOpenDevice(const ALCchar *deviceName)
if (!bDeviceFound) if (!bDeviceFound)
{ {
// No suitable output device found // No suitable output device found
SetALCError(ALC_INVALID_VALUE); alcSetError(ALC_INVALID_VALUE);
free(device); free(device);
device = NULL; device = NULL;
} }
} }
else else
SetALCError(ALC_OUT_OF_MEMORY); alcSetError(ALC_OUT_OF_MEMORY);
return device; return device;
} }
@ -1614,7 +1614,7 @@ ALCAPI ALCboolean ALCAPIENTRY alcCloseDevice(ALCdevice *pDevice)
bReturn = ALC_TRUE; bReturn = ALC_TRUE;
} }
else else
SetALCError(ALC_INVALID_DEVICE); alcSetError(ALC_INVALID_DEVICE);
return bReturn; return bReturn;
} }

2
Alc/alsa.c
View File

@ -883,7 +883,7 @@ static void alsa_capture_samples(ALCdevice *pDevice, ALCvoid *pBuffer, ALCuint l
if(lSamples <= (ALCuint)RingBufferSize(data->ring)) if(lSamples <= (ALCuint)RingBufferSize(data->ring))
ReadRingBuffer(data->ring, pBuffer, lSamples); ReadRingBuffer(data->ring, pBuffer, lSamples);
else else
SetALCError(ALC_INVALID_VALUE); alcSetError(ALC_INVALID_VALUE);
} }
static ALCuint alsa_available_samples(ALCdevice *pDevice) static ALCuint alsa_available_samples(ALCdevice *pDevice)

2
Alc/dsound.c
View File

@ -230,7 +230,7 @@ static ALCboolean DSoundOpenPlayback(ALCdevice *device, const ALCchar *deviceNam
pData = calloc(1, sizeof(DSoundData)); pData = calloc(1, sizeof(DSoundData));
if(!pData) if(!pData)
{ {
SetALCError(ALC_OUT_OF_MEMORY); alcSetError(ALC_OUT_OF_MEMORY);
DSoundUnload(); DSoundUnload();
return ALC_FALSE; return ALC_FALSE;
} }

2
Alc/oss.c
View File

@ -445,7 +445,7 @@ static void oss_capture_samples(ALCdevice *pDevice, ALCvoid *pBuffer, ALCuint lS
if(lSamples <= (ALCuint)RingBufferSize(data->ring)) if(lSamples <= (ALCuint)RingBufferSize(data->ring))
ReadRingBuffer(data->ring, pBuffer, lSamples); ReadRingBuffer(data->ring, pBuffer, lSamples);
else else
SetALCError(ALC_INVALID_VALUE); alcSetError(ALC_INVALID_VALUE);
} }
static ALCuint oss_available_samples(ALCdevice *pDevice) static ALCuint oss_available_samples(ALCdevice *pDevice)

2
Alc/pulseaudio.c
View File

@ -656,7 +656,7 @@ static void pulse_capture_samples(ALCdevice *device, ALCvoid *buffer, ALCuint sa
ALCuint available = RingBufferSize(data->ring); ALCuint available = RingBufferSize(data->ring);
if(available < samples) if(available < samples)
SetALCError(ALC_INVALID_VALUE); alcSetError(ALC_INVALID_VALUE);
else else
ReadRingBuffer(data->ring, buffer, samples); ReadRingBuffer(data->ring, buffer, samples);
} //}}} } //}}}

4
Alc/winmm.c
View File

@ -202,7 +202,7 @@ static ALCboolean WinMMOpenCapture(ALCdevice *pDevice, const ALCchar *deviceName
pData = calloc(1, sizeof(*pData)); pData = calloc(1, sizeof(*pData));
if(!pData) if(!pData)
{ {
SetALCError(ALC_OUT_OF_MEMORY); alcSetError(ALC_OUT_OF_MEMORY);
return ALC_FALSE; return ALC_FALSE;
} }
@ -373,7 +373,7 @@ static void WinMMCaptureSamples(ALCdevice *pDevice, ALCvoid *pBuffer, ALCuint lS
frameSize; frameSize;
if(ulSamples > ulCapturedSamples) if(ulSamples > ulCapturedSamples)
{ {
SetALCError(ALC_INVALID_VALUE); alcSetError(ALC_INVALID_VALUE);
return; return;
} }

2
OpenAL32/Include/alMain.h
View File

@ -305,7 +305,7 @@ void AppendDeviceList(const ALCchar *name);
void AppendAllDeviceList(const ALCchar *name); void AppendAllDeviceList(const ALCchar *name);
void AppendCaptureDeviceList(const ALCchar *name); void AppendCaptureDeviceList(const ALCchar *name);
ALCvoid SetALCError(ALenum errorCode); ALCvoid alcSetError(ALenum errorCode);
ALCvoid SuspendContext(ALCcontext *context); ALCvoid SuspendContext(ALCcontext *context);
ALCvoid ProcessContext(ALCcontext *context); ALCvoid ProcessContext(ALCcontext *context);