]> git.tue.mpg.de Git - paraslash.git/commitdiff
alsa: Do not fail if sw params could not be installed.
authorAndre Noll <maan@systemlinux.org>
Mon, 23 Feb 2009 13:24:42 +0000 (14:24 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 23 Feb 2009 13:24:42 +0000 (14:24 +0100)
This is not fatal, so just print a warining.

alsa_write.c
error.h

index ae471679f076f17fbce5b3d8d27ed5458d1fb4cd..b10d5c62faa910dc92757e4ce77afc818c0a676a 100644 (file)
@@ -131,7 +131,7 @@ static int alsa_open(struct writer_node *w)
                        stop_threshold) < 0)
                return -E_STOP_THRESHOLD;
        if (snd_pcm_sw_params(pad->handle, swparams) < 0)
-               return -E_SW_PARAMS;
+               PARA_WARNING_LOG("unable to install sw params\n");
        pad->bytes_per_frame = snd_pcm_format_physical_width(FORMAT)
                * pad->channels / 8;
        PARA_INFO_LOG("bytes per frame: %zu\n", pad->bytes_per_frame);
diff --git a/error.h b/error.h
index 0a5fb21775c58b9437fa0bfe2ec70c86ac602ff3..78d29792141224f9c4b11e58a0827d5a37694f03 100644 (file)
--- a/error.h
+++ b/error.h
@@ -375,7 +375,6 @@ extern const char **para_errlist[];
        PARA_ERROR(SAMPLE_FORMAT, "sample format not available"), \
        PARA_ERROR(CHANNEL_COUNT, "channels count not available"), \
        PARA_ERROR(HW_PARAMS, "unable to install hw params"), \
-       PARA_ERROR(SW_PARAMS, "unable to install sw params"), \
        PARA_ERROR(BAD_PERIOD, "can not use period equal to buffer size"), \
        PARA_ERROR(ALSA_WRITE, "alsa write error"), \
        PARA_ERROR(PCM_OPEN, "unable to open pcm"), \