[alsa-cvslog] CVS: alsa-utils/aplay aplay.c,1.174,1.175
Brought to you by:
perex
From: Takashi I. <ti...@us...> - 2003-11-27 11:07:28
|
Update of /cvsroot/alsa/alsa-utils/aplay In directory sc8-pr-cvs1:/tmp/cvs-serv12014 Modified Files: aplay.c Log Message: - fixed the infinite loop in probing a card control. Index: aplay.c =================================================================== RCS file: /cvsroot/alsa/alsa-utils/aplay/aplay.c,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- aplay.c 5 Nov 2003 11:08:25 -0000 1.174 +++ aplay.c 27 Nov 2003 11:07:25 -0000 1.175 @@ -199,12 +199,12 @@ sprintf(name, "hw:%d", card); if ((err = snd_ctl_open(&handle, name, 0)) < 0) { error("control open (%i): %s", card, snd_strerror(err)); - continue; + goto next_card; } if ((err = snd_ctl_card_info(handle, info)) < 0) { error("control hardware info (%i): %s", card, snd_strerror(err)); snd_ctl_close(handle); - continue; + goto next_card; } fprintf(stderr, "**** List of %s Hardware Devices ****\n", snd_pcm_stream_name(stream)); dev = -1; @@ -239,6 +239,7 @@ } } snd_ctl_close(handle); + next_card: if (snd_card_next(&card) < 0) { error("snd_card_next"); break; |