X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=7f29665de46f0844589e36a144e4b61848dda79b;hp=89d79d13d86cc89ece5dc38358311e7e5606d4ac;hb=96bdf2d7b6206bb042031f2b13075a56bb8921a3;hpb=9337bed6e84a4068e750fb6597646b45778eeba7

diff --git a/write.c b/write.c
index 89d79d13..7f29665d 100644
--- a/write.c
+++ b/write.c
@@ -43,7 +43,7 @@ struct initial_delay_task {
 	struct task task;
 };
 
-static 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;
@@ -59,37 +59,37 @@ static struct writer_node_group *wng;
  */
 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;
 	}
-	cwt->channels = 2;
-	cwt->samplerate = 44100;
-	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->samplerate = 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->samplerate);
+	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)
@@ -110,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;
@@ -126,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",
@@ -137,25 +135,25 @@ 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++) {
 		int writer_num;
-		wng->writer_nodes[i].conf = check_writer_arg(
+		g->writer_nodes[i].conf = check_writer_arg(
 			conf.writer_arg[i], &writer_num);
-		if (!wng->writer_nodes[i].conf)
+		if (!g->writer_nodes[i].conf)
 			goto out;
-		wng->writer_nodes[i].writer = &writers[writer_num];
+		g->writer_nodes[i].writer = &writers[writer_num];
 	}
 	ret = 1;
 out:
 	if (ret > 0)
-		return wng;
-	free(wng);
+		return g;
+	free(g);
 	return NULL;
 }
 
@@ -212,9 +210,8 @@ 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();
-	init_sched();
 
 	wng = check_args();
 	if (!wng)