X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=416408a1f4cfe606d858ea833f4531225c3d90db;hp=93c63c8d333a8edfaf205392b27a7cc5046da249;hb=d6f52cebbb178c884ba54ea782efa56a009493db;hpb=ea689d919fd6fdbfaba2de9d1cd207e033c319fd

diff --git a/write.c b/write.c
index 93c63c8d..416408a1 100644
--- a/write.c
+++ b/write.c
@@ -1,258 +1,236 @@
 /*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
-/** \file write.c Paraslash's standalone wav/raw player */
+/** \file write.c Paraslash's standalone wav/raw player. */
 
+#include <regex.h>
 #include <sys/types.h>
 #include <dirent.h>
+#include <stdbool.h>
 
 #include "para.h"
 #include "string.h"
 #include "write.cmdline.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "stdin.h"
+#include "buffer_tree.h"
 #include "write.h"
 #include "write_common.h"
 #include "fd.h"
 #include "error.h"
 
-/** \cond */
 INIT_WRITE_ERRLISTS;
-/** \endcond */
 
-/**
- * check if given buffer contains a valid wave header
- */
+enum check_wav_state {
+	CWS_NEED_HEADER,
+	CWS_HAVE_HEADER,
+	CWS_NO_HEADER,
+};
+
 struct check_wav_task {
-	/** the buffer to check */
-	char *buf;
-	/** number of bytes loaded in \a buf */
-	size_t *loaded;
-	/** non-zero if end of file was reached */
-	int *eof;
-	/** number of channels specified in wav header given by \a buf */
+	int state;
+	/** Number of channels specified in wav header given by \a buf. */
 	unsigned channels;
-	/** samplerate specified in wav header given by \a buf */
+	/** Sample rate specified in wav header given by \a buf. */
 	unsigned samplerate;
-	/** the task structure for this task */
-	struct task task;
-};
-
-/**
- * delay writing until given time
- */
-struct initial_delay_task {
-	/** the time the first data should be written out */
-	struct timeval start_time;
-	/** the task structure for this task */
+	/** The task structure used by the scheduler. */
 	struct task task;
+	struct btr_node *btrn;
+	size_t min_iqs;
 };
 
 static struct write_args_info conf;
+
 static struct stdin_task sit;
-static struct check_wav_task cwt;
-static struct initial_delay_task idt;
-static struct writer_node_group *wng;
 
-/** length of a standard wav header */
+/** Length of a standard wav header. */
 #define WAV_HEADER_LEN 44
 
 /**
- * test if audio buffer contains a valid wave header
+ * Test if audio buffer contains a valid wave header.
  *
  * \return If not, return -E_NO_WAV_HEADER, otherwise, return zero. If
- * there is less than WAV_HEADER_LEN bytes awailable, return one.
+ * there is less than WAV_HEADER_LEN bytes available, return one.
  */
-static void check_wav_pre_select(__a_unused struct sched *s, struct task *t)
+static void check_wav_pre_select(struct sched *s, struct task *t)
 {
-	struct check_wav_task *wt = t->private_data;
-	unsigned char *a;
+	struct check_wav_task *cwt = container_of(t, struct check_wav_task, task);
+	int ret;
 
-	if (*wt->loaded < WAV_HEADER_LEN) {
-		t->ret = *wt->eof? -E_PREMATURE_END : 1;
-		return;
-	}
-	wt->channels = 2;
-	wt->samplerate = 44100;
-	a = (unsigned char*)wt->buf;
-	t->ret = -E_NO_WAV_HEADER;
-	if (a[0] != 'R' || a[1] != 'I' || a[2] != 'F' || a[3] != 'F')
-		return;
-	wt->channels = (unsigned) a[22];
-	wt->samplerate = a[24] + (a[25] << 8) + (a[26] << 16) + (a[27] << 24);
-	*wt->loaded -= WAV_HEADER_LEN;
-	memmove(wt->buf, wt->buf + WAV_HEADER_LEN, *wt->loaded);
-	t->ret = -E_WAV_HEADER_SUCCESS;
-	PARA_INFO_LOG("channels: %d, sample rate: %d\n", wt->channels, wt->samplerate);
+	ret = btr_node_status(cwt->btrn, cwt->min_iqs, BTR_NT_INTERNAL);
+	if (ret != 0)
+		sched_min_delay(s);
 }
 
-static void initial_delay_pre_select(struct sched *s, struct task *t)
+static int check_wav_exec(struct btr_node *btrn, const char *cmd, char **result)
 {
-	struct initial_delay_task *dt = t->private_data;
-	struct timeval diff;
+	struct check_wav_task *cwt = btr_context(btrn);
 
-	t->ret = -E_NO_DELAY;
-	if (!dt->start_time.tv_sec && !dt->start_time.tv_usec)
-		return;
-	t->ret = -E_DELAY_TIMEOUT;
-	if (tv_diff(now, &dt->start_time, &diff) > 0)
-		return;
-	t->ret = 1;
-	if (tv_diff(&s->timeout , &diff, NULL) > 0)
-		s->timeout = diff;
-}
 
-INIT_STDERR_LOGGING(conf.loglevel_arg)
+	if (!strcmp(cmd, "samplerate")) {
+		if (cwt->state != CWS_HAVE_HEADER)
+			return -E_BTR_NAVAIL;
+		*result = make_message("%d", cwt->samplerate);
+		return 1;
+	}
+	if (!strcmp(cmd, "channels")) {
+		if (cwt->state != CWS_HAVE_HEADER)
+			return -E_BTR_NAVAIL;
+		*result = make_message("%d", cwt->channels);
+		return 1;
+	}
+	return -ERRNO_TO_PARA_ERROR(ENOTSUP);
+}
 
-static struct writer_node_group *check_args(void)
+static void check_wav_post_select(__a_unused struct sched *s, struct task *t)
 {
-	int i, ret = -E_WRITE_SYNTAX;
-	struct writer_node_group *g = NULL;
+	struct check_wav_task *cwt = container_of(t, struct check_wav_task, task);
+	struct btr_node *btrn = cwt->btrn;
+	unsigned char *a;
+	size_t sz;
+	int ret;
 
-	if (conf.list_writers_given) {
-		char *msg = NULL;
-		FOR_EACH_WRITER(i) {
-			char *tmp = make_message("%s%s%s",
-				i? msg : "",
-				i? " " : "",
-				writer_names[i]);
-			free(msg);
-			msg = tmp;
-		}
-		fprintf(stderr, "%s\n", msg);
-		free(msg);
-		exit(EXIT_SUCCESS);
-	}
-	if (conf.start_time_given) {
-		long unsigned sec, usec;
-		if (sscanf(conf.start_time_arg, "%lu:%lu",
-				&sec, &usec) != 2)
-			goto out;
-		idt.start_time.tv_sec = sec;
-		idt.start_time.tv_usec = usec;
-	}
-	if (!conf.writer_given) {
-		g = setup_default_wng();
-		ret = 1;
+	t->error = 0;
+	ret = btr_node_status(btrn, cwt->min_iqs, BTR_NT_INTERNAL);
+	if (ret <= 0)
+		goto out;
+	if (cwt->state != CWS_NEED_HEADER)
+		goto pushdown;
+	btr_merge(btrn, cwt->min_iqs);
+	sz = btr_next_buffer(btrn, (char **)&a);
+	if (sz < cwt->min_iqs) /* file size less than WAV_HEADER_SIZE */
+		goto pushdown;
+	cwt->min_iqs = 0;
+	cwt->channels = 2;
+	cwt->samplerate = 44100;
+	if (a[0] != 'R' || a[1] != 'I' || a[2] != 'F' || a[3] != 'F') {
+		PARA_NOTICE_LOG("wav header not found\n");
+		cwt->state = CWS_NO_HEADER;
+		sprintf(t->status, "check wav: no header");
 		goto out;
 	}
-	g = wng_new(conf.writer_given);
-	ret = -E_WRITE_SYNTAX;
-	for (i = 0; i < conf.writer_given; i++) {
-		int writer_num;
-		g->writer_nodes[i].conf = check_writer_arg(
-			conf.writer_arg[i], &writer_num);
-		if (!g->writer_nodes[i].conf)
-			goto out;
-		g->writer_nodes[i].writer = &writers[writer_num];
-	}
-	ret = 1;
+	PARA_INFO_LOG("found wav header\n");
+	cwt->state = CWS_HAVE_HEADER;
+	sprintf(t->status, "check wav: have header");
+	cwt->channels = (unsigned) a[22];
+	cwt->samplerate = a[24] + (a[25] << 8) + (a[26] << 16) + (a[27] << 24);
+	PARA_INFO_LOG("channels: %d, sample rate: %d\n", cwt->channels, cwt->samplerate);
+	btr_consume(btrn, WAV_HEADER_LEN);
+pushdown:
+	btr_pushdown(btrn);
 out:
-	if (ret > 0)
-		return g;
-	free(g);
-	return NULL;
+	t->error = ret;
+	if (ret < 0)
+		btr_remove_node(btrn);
 }
 
-static void wng_event_handler(struct task *t)
-{
-	struct writer_node_group *g = t->private_data;
+static int loglevel;
+INIT_STDERR_LOGGING(loglevel)
 
-	PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret));
-	unregister_task(t);
-	wng_close(g);
+__noreturn static void print_help_and_die(void)
+{
+	int d = conf.detailed_help_given;
+	const char **p = d? write_args_info_detailed_help
+		: write_args_info_help;
+
+	printf_or_die("%s\n\n", WRITE_CMDLINE_PARSER_PACKAGE "-"
+		WRITE_CMDLINE_PARSER_VERSION);
+	printf_or_die("%s\n\n", write_args_info_usage);
+	for (; *p; p++)
+		printf_or_die("%s\n", *p);
+	print_writer_helps(d);
+	exit(0);
 }
 
-
-static void idt_event_handler(struct task *t)
+static int main_btr(struct sched *s)
 {
-	int ret;
+	int i, ret;
+	struct check_wav_task _cwt, *cwt = &_cwt;
+	struct writer_node *wns;
 
-	PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret));
-	unregister_task(t);
-	wng->buf = sit.buf;
-	wng->loaded = &sit.loaded;
-	wng->input_eof = &sit.eof;
-	wng->task.event_handler = wng_event_handler;
-	wng->channels = &cwt.channels;
-	wng->samplerate = &cwt.samplerate;
-	ret = wng_open(wng);
-	if (ret < 0) {
-		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
-		exit(EXIT_FAILURE);
+	loglevel = get_loglevel_by_name(conf.loglevel_arg);
+	sit.btrn = btr_new_node(&(struct btr_node_description)
+		EMBRACE(.name = "stdin"));
+	stdin_set_defaults(&sit);
+	register_task(&sit.task);
+
+	cwt->state = CWS_NEED_HEADER;
+	cwt->min_iqs = WAV_HEADER_LEN;
+	cwt->btrn = btr_new_node(&(struct btr_node_description)
+		EMBRACE(.name = "check_wav", .parent = sit.btrn,
+		.handler = check_wav_exec, .context = cwt));
+	sprintf(cwt->task.status, "check_wav");
+	cwt->task.pre_select = check_wav_pre_select;
+	cwt->task.post_select = check_wav_post_select;
+	cwt->task.error = 0;
+	register_task(&cwt->task);
+
+	ret = -E_WRITE_SYNTAX;
+	if (!conf.writer_given) {
+		i = 0;
+		wns = para_calloc(sizeof(*wns));
+		ret = setup_writer_node(NULL, cwt->btrn, wns);
+		if (ret < 0)
+			goto out;
+		i = 1;
+	} else {
+		wns = para_calloc(conf.writer_given * sizeof(*wns));
+		for (i = 0; i < conf.writer_given; i++) {
+			ret = setup_writer_node(conf.writer_arg[i],
+				cwt->btrn, wns + i);
+			if (ret < 0)
+				goto out;
+		}
 	}
-}
 
-static void cwt_event_handler(struct task *t)
-{
-	if (t->ret != -E_NO_WAV_HEADER && t->ret != -E_WAV_HEADER_SUCCESS) {
-		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret));
-		exit(EXIT_FAILURE);
+	s->default_timeout.tv_sec = 10;
+	s->default_timeout.tv_usec = 50000;
+	ret = schedule(s);
+out:
+	for (i--; i >= 0; i--) {
+		struct writer_node *wn = wns + i;
+		struct writer *w = writers + wn->writer_num;
+
+		w->close(wn);
+		btr_free_node(wn->btrn);
+		free(wn->conf);
 	}
-	PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret));
-	unregister_task(t);
-//	if (t->ret == -E_WAV_HEADER_SUCCESS) {
-//		conf.channels_arg = cwt.channels;
-//		conf.sample_rate_arg = cwt.sample_rate;
-//	}
-	idt.task.pre_select = initial_delay_pre_select;
-	idt.task.private_data = &idt;
-	idt.task.event_handler = idt_event_handler;
-	sprintf(idt.task.status, "initial_delay");
-	register_task(&idt.task);
+	free(wns);
+	btr_free_node(cwt->btrn);
+	return ret;
 }
 
 /**
- * para_write's main function
+ * Para_write's main function.
  *
- * \param argc the usual argument counter
- * \param argv the usual argument vector
+ * \param argc The usual argument counter.
+ * \param argv The usual argument vector.
  *
- * It registers the stdin task, the check_wav_task, the task for initial delay
- * and all tasks for actually writing out the stream.
+ * It sets up and starts the tasks and the buffer tree nodes determined by
+ * command line options.
  *
  * \return \p EXIT_SUCCESS or EXIT_FAILURE
  */
 int main(int argc, char *argv[])
 {
 	int ret = -E_WRITE_SYNTAX;
-	struct sched s;
+	static struct sched s;
 
+	writer_init();
 	write_cmdline_parser(argc, argv, &conf);
 	HANDLE_VERSION_FLAG("write", conf);
-	init_supported_writers();
-
-	wng = check_args();
-	if (!wng)
-		goto out;
-	stdin_set_defaults(&sit);
-	if (conf.bufsize_given)
-		sit.bufsize = conf.bufsize_arg;
-	sit.buf = para_malloc(sit.bufsize),
-	register_task(&sit.task);
-
-	cwt.task.pre_select = check_wav_pre_select;
-	cwt.task.private_data = &cwt;
-	cwt.task.event_handler = cwt_event_handler;
-	cwt.buf = sit.buf;
-	cwt.loaded = &sit.loaded;
-	cwt.eof = &sit.eof;
-	sprintf(cwt.task.status, "check wav");
-	register_task(&cwt.task);
+	if (conf.help_given || conf.detailed_help_given)
+		print_help_and_die();
 
-	s.default_timeout.tv_sec = 1;
-	s.default_timeout.tv_usec = 0;
-	ret = sched(&s);
-
-out:
+	ret = main_btr(&s);
 	if (ret < 0) {
-		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
-		ret = EXIT_FAILURE;
-	} else
-		ret = EXIT_SUCCESS;
-	return ret;
+		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+		exit(EXIT_FAILURE);
+	}
+	exit(EXIT_SUCCESS);
 }