From: Andre Noll Date: Mon, 23 Feb 2009 13:24:42 +0000 (+0100) Subject: alsa: Do not fail if sw params could not be installed. X-Git-Tag: v0.3.4~58 X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=deaebb6eaaa83ec633b851c9c918683508008e47;p=paraslash.git alsa: Do not fail if sw params could not be installed. This is not fatal, so just print a warining. --- diff --git a/alsa_write.c b/alsa_write.c index ae471679..b10d5c62 100644 --- a/alsa_write.c +++ b/alsa_write.c @@ -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 0a5fb217..78d29792 100644 --- 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"), \