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

Reduce some indentation

Browse Source
This commit is contained in:
Chris Robinson 2010-03-19 20:49:23 -07:00
parent 52f82f0b94
commit 2235a53824
1 changed files with 298 additions and 308 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

172
Alc/ALc.c
View File

@ -673,7 +673,7 @@ static ALCvoid ExitContext(ALCcontext *pContext)
ALC_API ALCdevice* ALC_APIENTRY alcCaptureOpenDevice(const ALCchar *deviceName, ALCuint frequency, ALCenum format, ALCsizei SampleSize) ALC_API ALCdevice* ALC_APIENTRY alcCaptureOpenDevice(const ALCchar *deviceName, ALCuint frequency, ALCenum format, ALCsizei SampleSize)
{ {
ALCboolean DeviceFound = ALC_FALSE; ALCboolean DeviceFound = ALC_FALSE;
ALCdevice *pDevice = NULL; ALCdevice *device = NULL;
ALCint i; ALCint i;
if(SampleSize <= 0) if(SampleSize <= 0)
@ -685,31 +685,32 @@ ALC_API ALCdevice* ALC_APIENTRY alcCaptureOpenDevice(const ALCchar *deviceName,
if(deviceName && !deviceName[0]) if(deviceName && !deviceName[0])
deviceName = NULL; deviceName = NULL;
pDevice = malloc(sizeof(ALCdevice)); device = calloc(1, sizeof(ALCdevice));
if (pDevice) if(!device)
{ {
//Initialise device structure alcSetError(NULL, ALC_OUT_OF_MEMORY);
memset(pDevice, 0, sizeof(ALCdevice)); return NULL;
}
//Validate device //Validate device
pDevice->Connected = ALC_TRUE; device->Connected = ALC_TRUE;
pDevice->IsCaptureDevice = AL_TRUE; device->IsCaptureDevice = AL_TRUE;
pDevice->szDeviceName = NULL; device->szDeviceName = NULL;
pDevice->Frequency = frequency; device->Frequency = frequency;
pDevice->Format = format; device->Format = format;
pDevice->UpdateSize = SampleSize; device->UpdateSize = SampleSize;
pDevice->NumUpdates = 1; device->NumUpdates = 1;
SuspendContext(NULL); SuspendContext(NULL);
for(i = 0;BackendList[i].Init;i++) for(i = 0;BackendList[i].Init;i++)
{ {
pDevice->Funcs = &BackendList[i].Funcs; device->Funcs = &BackendList[i].Funcs;
if(ALCdevice_OpenCapture(pDevice, deviceName)) if(ALCdevice_OpenCapture(device, deviceName))
{ {
pDevice->next = g_pDeviceList; device->next = g_pDeviceList;
g_pDeviceList = pDevice; g_pDeviceList = device;
g_ulDeviceCount++; g_ulDeviceCount++;
DeviceFound = ALC_TRUE; DeviceFound = ALC_TRUE;
@ -721,23 +722,23 @@ ALC_API ALCdevice* ALC_APIENTRY alcCaptureOpenDevice(const ALCchar *deviceName,
if(!DeviceFound) if(!DeviceFound)
{ {
alcSetError(NULL, ALC_INVALID_VALUE); alcSetError(NULL, ALC_INVALID_VALUE);
free(pDevice); free(device);
pDevice = NULL; device = NULL;
} }
}
else
alcSetError(NULL, ALC_OUT_OF_MEMORY);
return pDevice; return device;
} }
ALC_API ALCboolean ALC_APIENTRY alcCaptureCloseDevice(ALCdevice *pDevice) ALC_API ALCboolean ALC_APIENTRY alcCaptureCloseDevice(ALCdevice *pDevice)
{ {
ALCboolean bReturn = ALC_FALSE;
ALCdevice **list; ALCdevice **list;
if(IsDevice(pDevice) && pDevice->IsCaptureDevice) if(!IsDevice(pDevice) || !pDevice->IsCaptureDevice)
{ {
alcSetError(pDevice, ALC_INVALID_DEVICE);
return ALC_FALSE;
}
SuspendContext(NULL); SuspendContext(NULL);
list = &g_pDeviceList; list = &g_pDeviceList;
@ -756,48 +757,43 @@ ALC_API ALCboolean ALC_APIENTRY alcCaptureCloseDevice(ALCdevice *pDevice)
free(pDevice); free(pDevice);
bReturn = ALC_TRUE; return ALC_TRUE;
}
else
alcSetError(pDevice, ALC_INVALID_DEVICE);
return bReturn;
} }
ALC_API void ALC_APIENTRY alcCaptureStart(ALCdevice *pDevice) ALC_API void ALC_APIENTRY alcCaptureStart(ALCdevice *device)
{ {
if(IsDevice(pDevice) && pDevice->IsCaptureDevice) if(!IsDevice(device) || !device->IsCaptureDevice)
{ {
SuspendContext(NULL); alcSetError(device, ALC_INVALID_DEVICE);
ALCdevice_StartCapture(pDevice); return;
ProcessContext(NULL);
} }
else SuspendContext(NULL);
alcSetError(pDevice, ALC_INVALID_DEVICE); ALCdevice_StartCapture(device);
ProcessContext(NULL);
} }
ALC_API void ALC_APIENTRY alcCaptureStop(ALCdevice *pDevice) ALC_API void ALC_APIENTRY alcCaptureStop(ALCdevice *device)
{ {
if(IsDevice(pDevice) && pDevice->IsCaptureDevice) if(!IsDevice(device) || !device->IsCaptureDevice)
{ {
SuspendContext(NULL); alcSetError(device, ALC_INVALID_DEVICE);
ALCdevice_StopCapture(pDevice); return;
ProcessContext(NULL);
} }
else SuspendContext(NULL);
alcSetError(pDevice, ALC_INVALID_DEVICE); ALCdevice_StopCapture(device);
ProcessContext(NULL);
} }
ALC_API void ALC_APIENTRY alcCaptureSamples(ALCdevice *pDevice, ALCvoid *pBuffer, ALCsizei lSamples) ALC_API void ALC_APIENTRY alcCaptureSamples(ALCdevice *device, ALCvoid *buffer, ALCsizei samples)
{ {
if(IsDevice(pDevice) && pDevice->IsCaptureDevice) if(!IsDevice(device) || !device->IsCaptureDevice)
{ {
SuspendContext(NULL); alcSetError(device, ALC_INVALID_DEVICE);
ALCdevice_CaptureSamples(pDevice, pBuffer, lSamples); return;
ProcessContext(NULL);
} }
else SuspendContext(NULL);
alcSetError(pDevice, ALC_INVALID_DEVICE); ALCdevice_CaptureSamples(device, buffer, samples);
ProcessContext(NULL);
} }
/* /*
@ -1123,12 +1119,15 @@ ALC_API ALCvoid ALC_APIENTRY alcGetIntegerv(ALCdevice *device,ALCenum param,ALsi
ALC_API ALCboolean ALC_APIENTRY alcIsExtensionPresent(ALCdevice *device, const ALCchar *extName) ALC_API ALCboolean ALC_APIENTRY alcIsExtensionPresent(ALCdevice *device, const ALCchar *extName)
{ {
ALCboolean bResult = ALC_FALSE; ALCboolean bResult = ALC_FALSE;
if (extName)
{
const char *ptr; const char *ptr;
size_t len; size_t len;
if(!extName)
{
alcSetError(device, ALC_INVALID_VALUE);
return ALC_FALSE;
}
len = strlen(extName); len = strlen(extName);
ptr = (IsDevice(device) ? alcExtensionList : alcNoDeviceExtList); ptr = (IsDevice(device) ? alcExtensionList : alcNoDeviceExtList);
while(ptr && *ptr) while(ptr && *ptr)
@ -1146,9 +1145,6 @@ ALC_API ALCboolean ALC_APIENTRY alcIsExtensionPresent(ALCdevice *device, const A
} while(isspace(*ptr)); } while(isspace(*ptr));
} }
} }
}
else
alcSetError(device, ALC_INVALID_VALUE);
return bResult; return bResult;
} }
@ -1161,20 +1157,17 @@ ALC_API ALCboolean ALC_APIENTRY alcIsExtensionPresent(ALCdevice *device, const A
*/ */
ALC_API ALCvoid* ALC_APIENTRY alcGetProcAddress(ALCdevice *device, const ALCchar *funcName) ALC_API ALCvoid* ALC_APIENTRY alcGetProcAddress(ALCdevice *device, const ALCchar *funcName)
{ {
ALCvoid *pFunction = NULL;
ALsizei i = 0; ALsizei i = 0;
if (funcName) if(!funcName)
{ {
while(alcFunctions[i].funcName &&
strcmp(alcFunctions[i].funcName,funcName) != 0)
i++;
pFunction = alcFunctions[i].address;
}
else
alcSetError(device, ALC_INVALID_VALUE); alcSetError(device, ALC_INVALID_VALUE);
return NULL;
}
return pFunction; while(alcFunctions[i].funcName && strcmp(alcFunctions[i].funcName,funcName) != 0)
i++;
return alcFunctions[i].address;
} }
@ -1188,7 +1181,7 @@ ALC_API ALCenum ALC_APIENTRY alcGetEnumValue(ALCdevice *device, const ALCchar *e
ALsizei i = 0; ALsizei i = 0;
ALCenum val; ALCenum val;
while ((enumeration[i].enumName)&&(strcmp(enumeration[i].enumName,enumName))) while(enumeration[i].enumName && strcmp(enumeration[i].enumName,enumName) == 0)
i++; i++;
val = enumeration[i].value; val = enumeration[i].value;
@ -1389,12 +1382,17 @@ ALC_API ALCcontext* ALC_APIENTRY alcCreateContext(ALCdevice *device, const ALCin
*/ */
ALC_API ALCvoid ALC_APIENTRY alcDestroyContext(ALCcontext *context) ALC_API ALCvoid ALC_APIENTRY alcDestroyContext(ALCcontext *context)
{ {
ALCdevice *Device;
ALCcontext **list; ALCcontext **list;
ALuint i; ALuint i;
if (IsContext(context)) if(!IsContext(context))
{ {
ALCdevice *Device = context->Device; alcSetError(NULL, ALC_INVALID_CONTEXT);
return;
}
Device = context->Device;
if(Device->NumContexts == 1) if(Device->NumContexts == 1)
ALCdevice_StopPlayback(Device); ALCdevice_StopPlayback(Device);
@ -1445,9 +1443,6 @@ ALC_API ALCvoid ALC_APIENTRY alcDestroyContext(ALCcontext *context)
// Free memory (MUST do this after ProcessContext) // Free memory (MUST do this after ProcessContext)
memset(context, 0, sizeof(ALCcontext)); memset(context, 0, sizeof(ALCcontext));
free(context); free(context);
}
else
alcSetError(NULL, ALC_INVALID_CONTEXT);
} }
@ -1500,7 +1495,7 @@ ALC_API ALCdevice* ALC_APIENTRY alcGetContextsDevice(ALCcontext *pContext)
ALCdevice *pDevice = NULL; ALCdevice *pDevice = NULL;
SuspendContext(NULL); SuspendContext(NULL);
if (IsContext(pContext)) if(IsContext(pContext))
pDevice = pContext->Device; pDevice = pContext->Device;
else else
alcSetError(NULL, ALC_INVALID_CONTEXT); alcSetError(NULL, ALC_INVALID_CONTEXT);
@ -1698,19 +1693,19 @@ static ALenum GetFormatFromString(const char *str)
ALC_API ALCdevice* ALC_APIENTRY alcOpenDevice(const ALCchar *deviceName) ALC_API ALCdevice* ALC_APIENTRY alcOpenDevice(const ALCchar *deviceName)
{ {
ALboolean bDeviceFound = AL_FALSE; ALboolean bDeviceFound = AL_FALSE;
const ALCchar *fmt;
ALCdevice *device; ALCdevice *device;
ALint i; ALint i;
if(deviceName && !deviceName[0]) if(deviceName && !deviceName[0])
deviceName = NULL; deviceName = NULL;
device = malloc(sizeof(ALCdevice)); device = calloc(1, sizeof(ALCdevice));
if (device) if(!device)
{ {
const char *fmt; alcSetError(NULL, ALC_OUT_OF_MEMORY);
return NULL;
//Initialise device structure }
memset(device, 0, sizeof(ALCdevice));
//Validate device //Validate device
device->Connected = ALC_TRUE; device->Connected = ALC_TRUE;
@ -1785,16 +1780,13 @@ ALC_API ALCdevice* ALC_APIENTRY alcOpenDevice(const ALCchar *deviceName)
} }
ProcessContext(NULL); ProcessContext(NULL);
if (!bDeviceFound) if(!bDeviceFound)
{ {
// No suitable output device found // No suitable output device found
alcSetError(NULL, ALC_INVALID_VALUE); alcSetError(NULL, ALC_INVALID_VALUE);
free(device); free(device);
device = NULL; device = NULL;
} }
}
else
alcSetError(NULL, ALC_OUT_OF_MEMORY);
return device; return device;
} }
@ -1807,11 +1799,14 @@ ALC_API ALCdevice* ALC_APIENTRY alcOpenDevice(const ALCchar *deviceName)
*/ */
ALC_API ALCboolean ALC_APIENTRY alcCloseDevice(ALCdevice *pDevice) ALC_API ALCboolean ALC_APIENTRY alcCloseDevice(ALCdevice *pDevice)
{ {
ALCboolean bReturn = ALC_FALSE;
ALCdevice **list; ALCdevice **list;
if(IsDevice(pDevice) && !pDevice->IsCaptureDevice) if(!IsDevice(pDevice) || pDevice->IsCaptureDevice)
{ {
alcSetError(pDevice, ALC_INVALID_DEVICE);
return ALC_FALSE;
}
SuspendContext(NULL); SuspendContext(NULL);
list = &g_pDeviceList; list = &g_pDeviceList;
@ -1875,12 +1870,7 @@ ALC_API ALCboolean ALC_APIENTRY alcCloseDevice(ALCdevice *pDevice)
memset(pDevice, 0, sizeof(ALCdevice)); memset(pDevice, 0, sizeof(ALCdevice));
free(pDevice); free(pDevice);
bReturn = ALC_TRUE; return ALC_TRUE;
}
else
alcSetError(pDevice, ALC_INVALID_DEVICE);
return bReturn;
} }