X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=8e8b693c2f99752ea2ce1d9b7481084d6dcb0150;hp=faadec1f673b5064465bf6151fcaa12990098359;hb=cd8bb5a2d51179a31842a2cd7012cad28deea78d;hpb=d062b0c045134ad325ba2c92673dcc11ca781621

diff --git a/alsa_write.c b/alsa_write.c
index faadec1f..8e8b693c 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -59,8 +59,7 @@ static int alsa_open(struct writer_node *w)
 {
 	snd_pcm_hw_params_t *hwparams;
 	snd_pcm_sw_params_t *swparams;
-	snd_pcm_uframes_t buffer_size, xfer_align, start_threshold,
-		stop_threshold;
+	snd_pcm_uframes_t buffer_size, start_threshold, stop_threshold;
 	int err;
 	snd_pcm_info_t *info;
 	snd_pcm_uframes_t period_size;
@@ -118,14 +117,11 @@ static int alsa_open(struct writer_node *w)
 	if (period_size == buffer_size)
 		return -E_BAD_PERIOD;
 	snd_pcm_sw_params_current(pad->handle, swparams);
-	err = snd_pcm_sw_params_get_xfer_align(swparams, &xfer_align);
-	if (err < 0 || !xfer_align)
-		return -E_GET_XFER;
 	snd_pcm_sw_params_set_avail_min(pad->handle, swparams, period_size);
-	/* round to closest transfer boundary */
-	start_threshold = (buffer_size / xfer_align) * xfer_align;
-	if (start_threshold < 1)
+	if (buffer_size < 1)
 		start_threshold = 1;
+	else
+		start_threshold = buffer_size;
 	if (snd_pcm_sw_params_set_start_threshold(pad->handle, swparams,
 			start_threshold) < 0)
 		return -E_START_THRESHOLD;
@@ -133,9 +129,6 @@ static int alsa_open(struct writer_node *w)
 	if (snd_pcm_sw_params_set_stop_threshold(pad->handle, swparams,
 			stop_threshold) < 0)
 		return -E_STOP_THRESHOLD;
-	if (snd_pcm_sw_params_set_xfer_align(pad->handle, swparams,
-			xfer_align) < 0)
-		return -E_SET_XFER;
 	if (snd_pcm_sw_params(pad->handle, swparams) < 0)
 		return -E_SW_PARAMS;
 	pad->bytes_per_frame = snd_pcm_format_physical_width(FORMAT)
@@ -176,7 +169,7 @@ static int alsa_write_post_select(__a_unused struct sched *s,
 
 //	PARA_INFO_LOG("%zd frames\n", frames);
 	if (!frames) {
-		if (*wng->input_eof)
+		if (*wng->input_error)
 			wn->written = *wng->loaded;
 		return 1;
 	}