geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup SDL_GetAudioDeviceName 

- drop unnecessary hascapture check
- call SDL_InvalidParamError in case the index is out of range
main
pionere 2022-01-19 17:18:47 +01:00 committed by Ryan C. Gordon
parent f91211eb17
commit 113109f839
1 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/audio/SDL_audio.c
View File

@ -1081,38 +1081,29 @@ SDL_GetNumAudioDevices(int iscapture)
const char * const char *
SDL_GetAudioDeviceName(int index, int iscapture) SDL_GetAudioDeviceName(int index, int iscapture)
{ {
const char *retval = NULL; SDL_AudioDeviceItem *item;
int i;
const char *retval;
if (!SDL_GetCurrentAudioDriver()) { if (!SDL_GetCurrentAudioDriver()) {
SDL_SetError("Audio subsystem is not initialized"); SDL_SetError("Audio subsystem is not initialized");
return NULL; return NULL;
} }
if (iscapture && !current_audio.impl.HasCaptureSupport) { SDL_LockMutex(current_audio.detectionLock);
SDL_SetError("No capture support"); item = iscapture ? current_audio.inputDevices : current_audio.outputDevices;
return NULL; i = iscapture ? current_audio.inputDeviceCount : current_audio.outputDeviceCount;
} if (index >= 0 && index < i) {
for (i--; i > index; i--, item = item->next) {
if (index >= 0) {
SDL_AudioDeviceItem *item;
int i;
SDL_LockMutex(current_audio.detectionLock);
item = iscapture ? current_audio.inputDevices : current_audio.outputDevices;
i = iscapture ? current_audio.inputDeviceCount : current_audio.outputDeviceCount;
if (index < i) {
for (i--; i > index; i--, item = item->next) {
SDL_assert(item != NULL);
}
SDL_assert(item != NULL); SDL_assert(item != NULL);
retval = item->name;
} }
SDL_UnlockMutex(current_audio.detectionLock); SDL_assert(item != NULL);
} retval = item->name;
} else {
if (retval == NULL) { SDL_InvalidParamError("index");
SDL_SetError("No such device"); retval = NULL;
} }
SDL_UnlockMutex(current_audio.detectionLock);
return retval; return retval;
} }