X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=alsa_write.c;h=3428def83076b9f8b89fc4c1e41bd0c921e54fbb;hb=2ef39ae4d1e6b0d95991d2b980621fb152211444;hp=dfa7a2e1a5ba068da9e457068e50eeccdf079ad3;hpb=f3b4f3298d2dffdb84a121b7d4aa561975f79be9;p=paraslash.git

diff --git a/alsa_write.c b/alsa_write.c
index dfa7a2e1..3428def8 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -46,7 +46,6 @@ struct private_alsa_write_data {
 	 * of the writer node group.
 	 */
 	unsigned sample_rate;
-
 	snd_pcm_format_t sample_format;
 	/**
 	 * The number of channels, given by command line option or the
@@ -144,10 +143,9 @@ static int alsa_init(struct private_alsa_write_data *pad,
 }
 
 /* Open an instance of the alsa writer. */
-static int alsa_open(struct writer_node *wn)
+static void alsa_open(struct writer_node *wn)
 {
 	wn->private_data = para_calloc(sizeof(struct private_alsa_write_data));
-	return 1;
 }
 
 static void alsa_write_pre_select(struct sched *s, struct task *t)
@@ -156,15 +154,12 @@ static void alsa_write_pre_select(struct sched *s, struct task *t)
 	struct private_alsa_write_data *pad = wn->private_data;
 	struct timeval tv;
 	snd_pcm_sframes_t avail, underrun;
-	int ret;
+	int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
 
-	if (!pad->handle)
-		return;
-	ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
-	if (ret < 0)
-		sched_request_timeout_ms(20, s);
-	if (ret <= 0)
+	if (ret == 0)
 		return;
+	if (ret < 0 || !pad->handle)
+		return sched_min_delay(s);
 	/*
 	 * Data is available to be written to the alsa handle.  Compute number
 	 * of milliseconds until next buffer underrun would occur.
@@ -184,8 +179,7 @@ static void alsa_write_pre_select(struct sched *s, struct task *t)
 		underrun = 50;
 	underrun -= 50;
 	ms2tv(underrun, &tv);
-	if (tv_diff(&s->timeout, &tv, NULL) > 0)
-		s->timeout = tv;
+	sched_request_timeout(&tv, s);
 }
 
 static void alsa_close(struct writer_node *wn)
@@ -258,6 +252,7 @@ again:
 		if (ret < 0)
 			goto err;
 		wn->min_iqs = pad->bytes_per_frame;
+		goto again;
 	}
 	frames = bytes / pad->bytes_per_frame;
 	frames = snd_pcm_writei(pad->handle, data, frames);
@@ -280,21 +275,14 @@ err:
 	t->error = ret;
 }
 
-__malloc static void *alsa_parse_config(const char *options)
+__malloc static void *alsa_parse_config_or_die(const char *options)
 {
-	int ret;
-	struct alsa_write_args_info *conf
-		= para_calloc(sizeof(struct alsa_write_args_info));
+	struct alsa_write_args_info *conf = para_calloc(sizeof(*conf));
 
 	PARA_INFO_LOG("options: %s, %zd\n", options, strcspn(options, " \t"));
-	ret = alsa_cmdline_parser_string(options, conf, "alsa_write");
-	if (ret)
-		goto err_out;
-	PARA_INFO_LOG("help given: %d\n", conf->help_given);
+	/* exits on errors */
+	alsa_cmdline_parser_string(options, conf, "alsa_write");
 	return conf;
-err_out:
-	free(conf);
-	return NULL;
 }
 
 static void alsa_free_config(void *conf)
@@ -318,7 +306,7 @@ void alsa_write_init(struct writer *w)
 	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->parse_config_or_die = alsa_parse_config_or_die;
 	w->shutdown = NULL; /* nothing to do */
 	w->free_config = alsa_free_config;
 	w->help = (struct ggo_help) {