X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=0f0f1f7d152ef7d3d0b2086f64ffd4f45de2b283;hp=faadec1f673b5064465bf6151fcaa12990098359;hb=fea782d9830f9ab5db25d37cb8cba8dabbe1824c;hpb=14960ed632ff6a07e5d4ae4a6b02f0f1da19a5b9

diff --git a/alsa_write.c b/alsa_write.c
index faadec1f..0f0f1f7d 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.
  */
@@ -41,7 +41,7 @@ struct private_alsa_write_data {
 	/**
 	 * the samplerate given by command line option or the decoder
 	 * of the writer node group
- 	 */
+	 */
 	unsigned samplerate;
 	/**
 	 * the number of channels, also given by command line option or the
@@ -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,15 +129,13 @@ 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)
 		* pad->channels / 8;
+	PARA_INFO_LOG("bytes per frame: %d\n", pad->bytes_per_frame);
 	if (snd_pcm_nonblock(pad->handle, 1))
-		PARA_ERROR_LOG("%s\n", "failed to set nonblock mode");
+		PARA_ERROR_LOG("failed to set nonblock mode\n");
 	return period_size * pad->bytes_per_frame;
 }
 
@@ -176,7 +170,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;
 	}
@@ -193,14 +187,16 @@ static int alsa_write_post_select(__a_unused struct sched *s,
 			frames, (int)ret);
 		return -E_ALSA_WRITE;
 	}
-	if (ret == -EAGAIN) { /* try again in 5ms */
-		PARA_WARNING_LOG("EAGAIN\n");
-		ms2tv(5, &tv);
-	} else {
+	if (ret == -EAGAIN)
+		PARA_DEBUG_LOG("EAGAIN\n");
+	else
 		wn->written += ret * pad->bytes_per_frame;
-		ms2tv(pad->buffer_time / 4000, &tv);
+	if (ret == frames) /* we wrote everything, try again immediately */
+		pad->next_chunk	= *now;
+	else {
+		ms2tv(pad->buffer_time / pad->bytes_per_frame / 1000, &tv);
+		tv_add(now, &tv, &pad->next_chunk);
 	}
-	tv_add(now, &tv, &pad->next_chunk);
 	return 1;
 }