X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write_common.c;h=5eb6b796cbff4a8ce74fae16017e4366485ae84f;hp=4619d40702338901d3437a4989afaf54889e334d;hb=bae94d3ba972bb91626e5f15e2d5ac44da6b041d;hpb=f87868b3147b189b6d4ee4e44817f092bd1c2895;ds=sidebyside

diff --git a/write_common.c b/write_common.c
index 4619d407..5eb6b796 100644
--- a/write_common.c
+++ b/write_common.c
@@ -6,6 +6,8 @@
 
 /** \file write_common.c common functions of para_audiod and para_write */
 
+#include <regex.h>
+
 #include "para.h"
 #include "string.h"
 #include "list.h"
@@ -27,9 +29,10 @@ static void wng_pre_select(__a_unused struct sched *s, struct task *t)
 
 	FOR_EACH_WRITER_NODE(i, g) {
 		struct writer_node *wn = &g->writer_nodes[i];
-		if (!wn->writer->pre_select)
+		struct writer *w = writers + wn->writer_num;
+		if (!w->pre_select)
 			continue;
-		t->error = wn->writer->pre_select(s, wn);
+		t->error = w->pre_select(s, wn);
 		if (t->error < 0)
 			return;
 	}
@@ -43,7 +46,8 @@ static void wng_post_select(struct sched *s, struct task *t)
 
 	FOR_EACH_WRITER_NODE(i, g) {
 		struct writer_node *wn = &g->writer_nodes[i];
-		t->error = wn->writer->post_select(s, wn);
+		struct writer *w = writers + wn->writer_num;
+		t->error = w->post_select(s, wn);
 		if (t->error < 0)
 			return;
 		if (!i)
@@ -84,8 +88,9 @@ int wng_open(struct writer_node_group *g)
 	PARA_NOTICE_LOG("opening wng %p with %d writer(s)\n", g, g->num_writers);
 	FOR_EACH_WRITER_NODE(i, g) {
 		struct writer_node *wn = &g->writer_nodes[i];
+		struct writer *w = writers + wn->writer_num;
 		wn->wng = g;
-		ret = wn->writer->open(wn);
+		ret = w->open(wn);
 		if (ret < 0)
 			goto err_out;
 	}
@@ -97,7 +102,8 @@ err_out:
 	PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	while (i > 0) {
 		struct writer_node *wn = &g->writer_nodes[--i];
-		wn->writer->close(wn);
+		struct writer *w = writers + wn->writer_num;
+		w->close(wn);
 	}
 	free(g->writer_nodes);
 	g->num_writers = 0;
@@ -121,7 +127,8 @@ void wng_close(struct writer_node_group *g)
 	PARA_NOTICE_LOG("closing wng with %d writer(s)\n", g->num_writers);
 	FOR_EACH_WRITER_NODE(i, g) {
 		struct writer_node *wn = &g->writer_nodes[i];
-		wn->writer->close(wn);
+		struct writer *w = writers + wn->writer_num;
+		w->close(wn);
 	}
 	free(g->writer_nodes);
 	free(g);
@@ -207,13 +214,17 @@ void *check_writer_arg(const char *wa, int *writer_num)
 struct writer_node_group *setup_default_wng(void)
 {
 	struct writer_node_group *wng = wng_new(1);
-	wng->writer_nodes[0].writer = &writers[DEFAULT_WRITER];
+	wng->writer_nodes[0].writer_num = DEFAULT_WRITER;
 	PARA_INFO_LOG("using default writer: %s %p\n",
 		writer_names[DEFAULT_WRITER], writers[DEFAULT_WRITER].parse_config);
 	wng->writer_nodes[0].conf = writers[DEFAULT_WRITER].parse_config("");
 	return wng;
 }
-
+/**
+ * Print the help text of all writers to stdout.
+ *
+ * \param detailed Whether to print the detailed help text.
+ */
 void print_writer_helps(int detailed)
 {
 	int i;