X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=7f29665de46f0844589e36a144e4b61848dda79b;hp=3e5a97e8076e9a3d70bbb0d5386ee9b605a4cae7;hb=96bdf2d7b6206bb042031f2b13075a56bb8921a3;hpb=148c7c722fd5795228f586b6ef8d953662b68224

diff --git a/write.c b/write.c
index 3e5a97e8..7f29665d 100644
--- a/write.c
+++ b/write.c
@@ -34,7 +34,7 @@ struct check_wav_task {
 	size_t *loaded;
 	int *eof;
 	unsigned channels;
-	unsigned sample_rate;
+	unsigned samplerate;
 	struct task task;
 };
 
@@ -43,7 +43,7 @@ struct initial_delay_task {
 	struct task task;
 };
 
-struct gengetopt_args_info conf;
+static struct write_args_info conf;
 struct stdin_task sit;
 struct check_wav_task cwt;
 struct initial_delay_task idt;
@@ -57,37 +57,39 @@ static struct writer_node_group *wng;
  * \return If not, return -E_NO_WAV_HEADER, otherwise, return zero. If
  * there is less than WAV_HEADER_LEN bytes awailable, return one.
  */
-static void check_wav_pre_select(struct sched *s, struct task *t)
+static void check_wav_pre_select(__a_unused struct sched *s, struct task *t)
 {
-	struct check_wav_task *cwt = t->private_data;
+	struct check_wav_task *wt = t->private_data;
 	unsigned char *a;
 
-	if (*cwt->loaded < WAV_HEADER_LEN) {
-		t->ret = *cwt->eof? -E_PREMATURE_END : 1;
+	if (*wt->loaded < WAV_HEADER_LEN) {
+		t->ret = *wt->eof? -E_PREMATURE_END : 1;
 		return;
 	}
-	a = (unsigned char*)cwt->buf;
+	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;
-	cwt->channels = (unsigned) a[22];
-	cwt->sample_rate = a[24] + (a[25] << 8) + (a[26] << 16) + (a[27] << 24);
-	*cwt->loaded -= WAV_HEADER_LEN;
-	memmove(cwt->buf, cwt->buf + WAV_HEADER_LEN, *cwt->loaded);
+	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", cwt->channels, cwt->sample_rate);
+	PARA_INFO_LOG("channels: %d, sample rate: %d\n", wt->channels, wt->samplerate);
 }
 
 static void initial_delay_pre_select(struct sched *s, struct task *t)
 {
-	struct initial_delay_task *idt = t->private_data;
+	struct initial_delay_task *dt = t->private_data;
 	struct timeval diff;
 
 	t->ret = -E_NO_DELAY;
-	if (!idt->start_time.tv_sec && !idt->start_time.tv_usec)
+	if (!dt->start_time.tv_sec && !dt->start_time.tv_usec)
 		return;
 	t->ret = -E_DELAY_TIMEOUT;
-	if (tv_diff(&s->now, &idt->start_time, &diff) > 0)
+	if (tv_diff(now, &dt->start_time, &diff) > 0)
 		return;
 	t->ret = 1;
 	if (tv_diff(&s->timeout , &diff, NULL) > 0)
@@ -108,7 +110,7 @@ void para_log(int ll, const char* fmt,...)
 static struct writer_node_group *check_args(void)
 {
 	int i, ret = -E_WRITE_SYNTAX;
-	struct writer_node_group *wng = NULL;
+	struct writer_node_group *g = NULL;
 
 	if (conf.list_writers_given) {
 		char *msg = NULL;
@@ -124,8 +126,6 @@ static struct writer_node_group *check_args(void)
 		free(msg);
 		exit(EXIT_SUCCESS);
 	}
-	if (conf.prebuffer_arg < 0 || conf.prebuffer_arg > 100)
-		goto out;
 	if (conf.start_time_given) {
 		long unsigned sec, usec;
 		if (sscanf(conf.start_time_arg, "%lu:%lu",
@@ -135,29 +135,39 @@ static struct writer_node_group *check_args(void)
 		idt.start_time.tv_usec = usec;
 	}
 	if (!conf.writer_given) {
-		wng = setup_default_wng();
+		g = setup_default_wng();
 		ret = 1;
 		goto out;
 	}
-	wng = wng_new(conf.writer_given);
+	g = wng_new(conf.writer_given);
+	ret = -E_WRITE_SYNTAX;
 	for (i = 0; i < conf.writer_given; i++) {
-		ret = check_writer_arg(conf.writer_arg[i]);
-		if (ret < 0)
+		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;
-		wng->writer_nodes[i].writer = &writers[ret];
-		sprintf(wng->writer_nodes[i].task.status, "%s",
-			writer_names[ret]);
+		g->writer_nodes[i].writer = &writers[writer_num];
 	}
 	ret = 1;
 out:
-	if (ret > 0) {
-		return wng;
-	}
-	free(wng);
+	if (ret > 0)
+		return g;
+	free(g);
 	return NULL;
 }
 
-static void idt_error_handler(struct task *t)
+static void wng_event_handler(struct task *t)
+{
+	struct writer_node_group *g = t->private_data;
+
+	PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret));
+	unregister_task(t);
+	wng_close(g);
+}
+
+
+static void idt_event_handler(struct task *t)
 {
 	int ret;
 
@@ -165,8 +175,10 @@ static void idt_error_handler(struct task *t)
 	unregister_task(t);
 	wng->buf = sit.buf;
 	wng->loaded = &sit.loaded;
-	wng->eof = &sit.eof;
-	sprintf(wng->task.status, "%s", "writer node group");
+	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));
@@ -174,7 +186,7 @@ static void idt_error_handler(struct task *t)
 	}
 }
 
-static void cwt_error_handler(struct task *t)
+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));
@@ -182,51 +194,37 @@ static void cwt_error_handler(struct task *t)
 	}
 	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;
-	}
+//	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.error_handler = idt_error_handler;
+	idt.task.event_handler = idt_event_handler;
 	sprintf(idt.task.status, "initial_delay");
 	register_task(&idt.task);
 }
 
-static void stdin_error_handler(struct task *t)
-{
-	unregister_task(t);
-	if (t->ret != -E_STDIN_EOF)
-		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret));
-	else
-		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret));
-}
-
 int main(int argc, char *argv[])
 {
 	int ret = -E_WRITE_SYNTAX;
 	struct sched s;
 
-	cmdline_parser(argc, argv, &conf);
+	write_cmdline_parser(argc, argv, &conf);
+	init_supported_writers();
+
 	wng = check_args();
 	if (!wng)
 		goto out;
-	init_supported_writers();
-	init_sched();
-
-	sit.bufsize = 16 * 1024,
-	sit.buf = para_malloc(16 * 1024),
-	sit.loaded = 0,
-	sit.task.pre_select = stdin_pre_select;
-	sit.task.post_select = stdin_post_select;
-	sit.task.error_handler = stdin_error_handler;
-	sit.task.private_data = &sit;
-	sprintf(sit.task.status, "stdin reader");
+	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.error_handler = cwt_error_handler;
+	cwt.task.event_handler = cwt_event_handler;
 	cwt.buf = sit.buf;
 	cwt.loaded = &sit.loaded;
 	cwt.eof = &sit.eof;