]> git.alsa-project.org Git - alsa-utils.git/commitdiff
alsabat: use variable for thread return value
authorLu, Han <han.lu@intel.com>
Mon, 21 Mar 2016 11:05:49 +0000 (19:05 +0800)
committerTakashi Iwai <tiwai@suse.de>
Mon, 21 Mar 2016 17:04:36 +0000 (18:04 +0100)
Use variable instead of 0/1 to indicate the return value of
playback and capture threads.

Signed-off-by: Lu, Han <han.lu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
bat/alsa.c

index 2540ab8d24e07222d5923960c76343c598af9fb5..79c86fe62b11c4756e59f59c81c60031854aa133 100644 (file)
@@ -383,13 +383,13 @@ void *playback_alsa(struct bat *bat)
        if (err != 0) {
                fprintf(bat->err, _("Cannot open PCM playback device: "));
                fprintf(bat->err, _("%s(%d)\n"), snd_strerror(err), err);
-               retval_play = 1;
+               retval_play = err;
                goto exit1;
        }
 
        err = set_snd_pcm_params(bat, &sndpcm);
        if (err != 0) {
-               retval_play = 1;
+               retval_play = err;
                goto exit2;
        }
 
@@ -406,20 +406,20 @@ void *playback_alsa(struct bat *bat)
                if (bat->fp == NULL) {
                        fprintf(bat->err, _("Cannot open file: %s %d\n"),
                                        bat->playback.file, err);
-                       retval_play = 1;
+                       retval_play = err;
                        goto exit3;
                }
                /* Skip header */
                err = read_wav_header(bat, bat->playback.file, bat->fp, true);
                if (err != 0) {
-                       retval_play = 1;
+                       retval_play = err;
                        goto exit4;
                }
        }
 
        err = write_to_pcm_loop(&sndpcm, bat);
        if (err != 0) {
-               retval_play = 1;
+               retval_play = err;
                goto exit4;
        }
 
@@ -533,13 +533,13 @@ void *record_alsa(struct bat *bat)
        if (err != 0) {
                fprintf(bat->err, _("Cannot open PCM capture device: "));
                fprintf(bat->err, _("%s(%d)\n"), snd_strerror(err), err);
-               retval_record = 1;
+               retval_record = err;
                goto exit1;
        }
 
        err = set_snd_pcm_params(bat, &sndpcm);
        if (err != 0) {
-               retval_record = 1;
+               retval_record = err;
                goto exit2;
        }
 
@@ -549,7 +549,7 @@ void *record_alsa(struct bat *bat)
        if (fp == NULL) {
                fprintf(bat->err, _("Cannot open file: %s %d\n"),
                                bat->capture.file, err);
-               retval_record = 1;
+               retval_record = err;
                goto exit3;
        }
 
@@ -563,7 +563,7 @@ void *record_alsa(struct bat *bat)
 
        err = write_wav_header(fp, &wav, bat);
        if (err != 0) {
-               retval_record = 1;
+               retval_record = err;
                goto exit4;
        }
 
@@ -571,7 +571,7 @@ void *record_alsa(struct bat *bat)
        fprintf(bat->log, _("Recording ...\n"));
        err = read_from_pcm_loop(fp, count, &sndpcm, bat);
        if (err != 0) {
-               retval_record = 1;
+               retval_record = err;
                goto exit4;
        }