X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=ae471679f076f17fbce5b3d8d27ed5458d1fb4cd;hp=c856ef4a2d23d256015028a89131fb19824f9a26;hb=9627e8157c8c916555b993d7254b0b638815ebc1;hpb=19d9318abf42debb15d833d4e56ab636893285c3;ds=sidebyside

diff --git a/alsa_write.c b/alsa_write.c
index c856ef4a..ae471679 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.
  */
@@ -21,6 +21,7 @@
 #include "string.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "write.h"
 #include "alsa_write.cmdline.h"
 #include "error.h"
@@ -41,7 +42,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 +60,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 +118,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 +130,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: %zu\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;
 }
 
@@ -193,14 +188,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;
 }
 
@@ -216,10 +213,12 @@ static void alsa_close(struct writer_node *wn)
 
 __malloc static void *alsa_parse_config(const char *options)
 {
+	int ret;
 	struct alsa_write_args_info *conf
 		= para_calloc(sizeof(struct alsa_write_args_info));
+
 	PARA_INFO_LOG("options: %s, %zd\n", options, strcspn(options, " \t"));
-	int ret = alsa_cmdline_parser_string(options, conf, "alsa_write");
+	ret = alsa_cmdline_parser_string(options, conf, "alsa_write");
 	if (ret)
 		goto err_out;
 	PARA_INFO_LOG("help given: %d\n", conf->help_given);
@@ -238,10 +237,17 @@ err_out:
  */
 void alsa_write_init(struct writer *w)
 {
+	struct alsa_write_args_info dummy;
+
+	alsa_cmdline_parser_init(&dummy);
 	w->open = alsa_open;
 	w->close = alsa_close;
 	w->pre_select = alsa_write_pre_select;
 	w->post_select = alsa_write_post_select;
 	w->parse_config = alsa_parse_config;
 	w->shutdown = NULL; /* nothing to do */
+	w->help = (struct ggo_help) {
+		.short_help = alsa_write_args_info_help,
+		.detailed_help = alsa_write_args_info_detailed_help
+	};
 }