X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=04a94f733aef71df6da073bfea868a47f258b32c;hp=e741578c66378d74926c28bea86a56c084bde255;hb=74c88020bd325865fe26ed25ea8ad0ace0924136;hpb=ff70d3f74c6116cf5b3c9a6708218788363efa7c

diff --git a/alsa_write.c b/alsa_write.c
index e741578c..04a94f73 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -15,8 +15,6 @@
 #include <regex.h>
 #include <sys/types.h>
 #include <alsa/asoundlib.h>
-#include <sys/time.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "fd.h"
@@ -73,7 +71,7 @@ static int alsa_init(struct private_alsa_write_data *pad,
 	snd_pcm_sw_params_t *swparams;
 	snd_pcm_uframes_t start_threshold, stop_threshold;
 	snd_pcm_uframes_t buffer_size, period_size;
-	snd_output_t *log;
+	snd_output_t *output_log;
 	unsigned buffer_time;
 	int ret;
 	const char *msg;
@@ -114,6 +112,8 @@ static int alsa_init(struct private_alsa_write_data *pad,
 		NULL);
 	if (ret < 0 || buffer_time == 0)
 		goto fail;
+	/* buffer at most 500 milliseconds */
+	buffer_time = PARA_MIN(buffer_time, 500U * 1000U);
 	msg = "could not set buffer time";
 	ret = snd_pcm_hw_params_set_buffer_time_near(pad->handle, hwparams,
 		&buffer_time, NULL);
@@ -162,12 +162,12 @@ static int alsa_init(struct private_alsa_write_data *pad,
 	ret = snd_pcm_nonblock(pad->handle, 1);
 	if (ret < 0)
 		goto fail;
-	ret = snd_output_buffer_open(&log);
+	ret = snd_output_buffer_open(&output_log);
 	if (ret == 0) {
 		char *buf;
 		PARA_INFO_LOG("dumping alsa configuration\n");
-		snd_pcm_dump(pad->handle, log);
-		snd_output_buffer_string(log, &buf);
+		snd_pcm_dump(pad->handle, output_log);
+		snd_output_buffer_string(output_log, &buf);
 		for (;;) {
 			char *p = strchr(buf, '\n');
 			if (!p) /* omit last output line, it's empty */
@@ -176,7 +176,7 @@ static int alsa_init(struct private_alsa_write_data *pad,
 			PARA_INFO_LOG("%s\n", buf);
 			buf = p + 1;
 		}
-		snd_output_close(log);
+		snd_output_close(output_log);
 	}
 	return 1;
 fail:
@@ -235,7 +235,7 @@ static void alsa_close(struct writer_node *wn)
 	free(pad);
 }
 
-static void alsa_write_post_select(__a_unused struct sched *s,
+static int alsa_write_post_select(__a_unused struct sched *s,
 		struct task *t)
 {
 	struct writer_node *wn = container_of(t, struct writer_node, task);
@@ -246,11 +246,13 @@ static void alsa_write_post_select(__a_unused struct sched *s,
 	snd_pcm_sframes_t frames;
 	int ret;
 
+	ret = task_get_notification(t);
+	if (ret < 0)
+		goto err;
 again:
-	t->error = 0;
 	ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF);
 	if (ret == 0)
-		return;
+		return 0;
 	btr_merge(btrn, wn->min_iqs);
 	bytes = btr_next_buffer(btrn, &data);
 	if (ret < 0 || bytes < wn->min_iqs) { /* eof */
@@ -263,17 +265,17 @@ again:
 			PARA_DEBUG_LOG("waiting for device to drain\n");
 			tv_add(now, &(struct timeval)EMBRACE(0, 200 * 1000),
 				&pad->drain_barrier);
-			return;
+			return 0;
 		}
 		if (tv_diff(now, &pad->drain_barrier, NULL) > 0)
 			goto err;
-		return;
+		return 0;
 	}
 	if (!pad) {
 		int32_t val;
 
 		if (bytes == 0) /* no data available */
-			return;
+			return 0;
 		pad = para_calloc(sizeof(*pad));
 		get_btr_sample_rate(btrn, &val);
 		pad->sample_rate = val;
@@ -294,7 +296,7 @@ again:
 		goto again;
 	}
 	if (pad->poll_fd < 0 || !FD_ISSET(pad->poll_fd, &s->rfds))
-		return;
+		return 0;
 	frames = bytes / pad->bytes_per_frame;
 	frames = snd_pcm_writei(pad->handle, data, frames);
 	if (frames == 0 || frames == -EAGAIN) {
@@ -308,7 +310,7 @@ again:
 		char buf[100];
 		if (read(pad->poll_fd, buf, 100))
 			do_nothing;
-		return;
+		return 0;
 	}
 	if (frames > 0) {
 		btr_consume(btrn, frames * pad->bytes_per_frame);
@@ -317,28 +319,28 @@ again:
 	if (frames == -EPIPE) {
 		PARA_WARNING_LOG("underrun (tried to write %zu bytes)\n", bytes);
 		snd_pcm_prepare(pad->handle);
-		return;
+		return 0;
 	}
 	PARA_ERROR_LOG("alsa write error: %s\n", snd_strerror(-frames));
 	ret = -E_ALSA;
 err:
 	assert(ret < 0);
-	btr_remove_node(btrn);
-	t->error = ret;
+	btr_remove_node(&wn->btrn);
+	return ret;
 }
 
-__malloc static void *alsa_parse_config_or_die(const char *options)
+__malloc static void *alsa_parse_config_or_die(int argc, char **argv)
 {
 	struct alsa_write_args_info *conf = para_calloc(sizeof(*conf));
 
 	/* exits on errors */
-	alsa_cmdline_parser_string(options, conf, "alsa_write");
+	alsa_write_cmdline_parser(argc, argv, conf);
 	return conf;
 }
 
 static void alsa_free_config(void *conf)
 {
-	alsa_cmdline_parser_free(conf);
+	alsa_write_cmdline_parser_free(conf);
 }
 
 /**
@@ -352,16 +354,15 @@ void alsa_write_init(struct writer *w)
 {
 	struct alsa_write_args_info dummy;
 
-	alsa_cmdline_parser_init(&dummy);
+	alsa_write_cmdline_parser_init(&dummy);
 	w->close = alsa_close;
 	w->pre_select = alsa_write_pre_select;
-	w->post_select = alsa_write_post_select;
+	w->new_post_select = alsa_write_post_select;
 	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) {
 		.short_help = alsa_write_args_info_help,
 		.detailed_help = alsa_write_args_info_detailed_help
 	};
-	alsa_cmdline_parser_free(&dummy);
+	alsa_write_cmdline_parser_free(&dummy);
 }