ryujinx/libsoundio
1
0
Fork 0
mirror of https://github.com/Ryujinx/libsoundio.git synced 2024-12-23 04:05:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #56 from clehner/master

Browse source 
Handle ALSA devices with null description
This commit is contained in:
Andrew Kelley 2016-01-26 20:15:29 -07:00
parent 6b8c306ea1 cdadcee7ed
commit 376ba4a4e6
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/alsa.c
View file

@ -79,6 +79,8 @@ static inline snd_pcm_uframes_t ceil_dbl_to_uframes(double x) {
} }
static char * str_partition_on_char(char *str, char c) { static char * str_partition_on_char(char *str, char c) {
if (!str)
return NULL;
while (*str) { while (*str) {
if (*str == c) { if (*str == c) {
*str = 0; *str = 0;
@ -573,7 +575,8 @@ static int refresh_devices(struct SoundIoPrivate *si) {
device->is_raw = false; device->is_raw = false;
device->id = strdup(name); device->id = strdup(name);
device->name = descr1 ? device->name = descr1 ?
soundio_alloc_sprintf(NULL, "%s: %s", descr, descr1) : strdup(descr); soundio_alloc_sprintf(NULL, "%s: %s", descr, descr1) : descr ?
strdup(descr) : strdup(name);
if (!device->id || !device->name) { if (!device->id || !device->name) {
soundio_device_unref(device); soundio_device_unref(device);