From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 29 Mar 2006 17:06:44 +0000 (+0000)
Subject: Remove loops after errors
X-Git-Tag: v1.0.11rc5~5
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=9b1a2566a1e9aa94778185a3fe6287030570844e;p=alsa-utils.git

Remove loops after errors

Don't retry after fatal errors.
---

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);