From: Andre Noll <maan@systemlinux.org>
Date: Mon, 2 Mar 2009 09:39:59 +0000 (+0100)
Subject: Merge commit 'meins/master'
X-Git-Tag: v0.3.4~57
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=eea9d1cae30df921ae2fd1771518b8b21dbd0daf;hp=2c5362b499b106b10e7be985660701f2c3c6af79

Merge commit 'meins/master'
---

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 c3ac3dca..24f2a113 100644
--- a/error.h
+++ b/error.h
@@ -389,7 +389,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"), \