summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2006-03-29 17:06:44 +0000
committerTakashi Iwai <tiwai@suse.de>2006-03-29 17:06:44 +0000
commit9b1a2566a1e9aa94778185a3fe6287030570844e (patch)
treecd76ad75f1ddfd9664ba4c0427e16c5c73d83c9c
parenta948ec42047390fc3f2ab9f67a2499b5b2ced189 (diff)
downloadalsa-utils-9b1a2566a1e9aa94778185a3fe6287030570844e.tar.gz
Remove loops after errors
Don't retry after fatal errors.
-rw-r--r--speaker-test/speaker-test.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/speaker-test/speaker-test.c b/speaker-test/speaker-test.c
index e555ac1..d47ed79 100644
--- a/speaker-test/speaker-test.c
+++ b/speaker-test/speaker-test.c
@@ -878,7 +878,7 @@ int main(int argc, char *argv[]) {
break;
}
-loop:
+
while ((err = snd_pcm_open(&handle, device, SND_PCM_STREAM_PLAYBACK, 0)) < 0) {
printf(_("Playback open error: %d,%s\n"), err,snd_strerror(err));
sleep(1);
@@ -887,14 +887,11 @@ loop:
if ((err = set_hwparams(handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) {
printf(_("Setting of hwparams failed: %s\n"), snd_strerror(err));
snd_pcm_close(handle);
- goto loop;
exit(EXIT_FAILURE);
}
- //getchar();
if ((err = set_swparams(handle, swparams)) < 0) {
printf(_("Setting of swparams failed: %s\n"), snd_strerror(err));
snd_pcm_close(handle);
- goto loop;
exit(EXIT_FAILURE);
}
@@ -932,18 +929,12 @@ loop:
printf(" %d - %s\n", channel, gettext(channel_name[channel]));
err = write_loop(handle, channel, ((rate*3)/period_size), frames);
- //err = write_loop(handle, 255, ((rate*3)/period_size), frames);
if (err < 0) {
printf(_("Transfer failed: %s\n"), snd_strerror(err));
free(frames);
snd_pcm_close(handle);
- printf(_("Pausing\n"));
- goto loop ;
- //pause();
- //printf("Done Pausing\n");
exit(EXIT_SUCCESS);
- goto loop ;
}
}
gettimeofday(&tv2, NULL);