more small audiod cleanups.

[paraslash.git] / write_common.c

diff --git a/write_common.c b/write_common.c
index 2cb0eafd45437d58fd79f988a6757fd41a69d7eb..7fb8d12337b6fdc28a1af741e5a0cd6a74f21ea4 100644 (file)
--- a/write_common.c
+++ b/write_common.c
@@ -28,7 +28,7 @@
 const char *writer_names[] ={WRITER_NAMES};
 struct writer writers[NUM_SUPPORTED_WRITERS] = {WRITER_ARRAY};
 
-static void wng_post_select(struct sched *s, struct task *t)
+static void wng_post_select(__a_unused struct sched *s, struct task *t)
 {
        struct writer_node_group *g = t->private_data;
        int i;
@@ -45,8 +45,8 @@ static void wng_post_select(struct sched *s, struct task *t)
                        min_written = PARA_MIN(min_written, t->ret);
        }
        *g->loaded -= min_written;
-       if (!*g->loaded && *g->eof)
-               t->ret = 0;
+       if (!*g->loaded && *g->input_eof)
+               t->ret = -E_WNG_EOF;
        else
                t->ret = 1;
        if (*g->loaded && min_written)
@@ -70,9 +70,10 @@ int wng_open(struct writer_node_group *g)
                wn->task.pre_select = wn->writer->pre_select;
                wn->task.post_select = wn->writer->post_select;
                wn->task.private_data = wn;
-               wn->task.flags = POST_EOF_IS_ERROR;
                register_task(&wn->task);
        }
+       sprintf(g->task.status, "%s", "writer node group");
+       g->eof = 0;
        register_task(&g->task);
 out:
        return ret;
@@ -98,16 +99,6 @@ void wng_close(struct writer_node_group *g)
        }
 }
 
-static void wng_error_handler(struct task *t)
-{
-       struct writer_node_group *g = t->private_data;
-
-       PARA_INFO_LOG("%p: ret = %d\n", t, t->ret);
-       unregister_task(t);
-       wng_close(g);
-       wng_destroy(g);
-}
-
 struct writer_node_group *wng_new(unsigned num_writers)
 {
        struct writer_node_group *g = para_calloc(sizeof(struct writer_node_group));
@@ -117,8 +108,7 @@ struct writer_node_group *wng_new(unsigned num_writers)
        g->written = para_calloc(num_writers * sizeof(size_t));
        g->task.private_data = g;
        g->task.post_select = wng_post_select;
-       g->task.error_handler = wng_error_handler;
-       g->task.flags = POST_ADD_TAIL | POST_EOF_IS_ERROR;
+       g->task.flags = POST_ADD_TAIL;
        return g;
 }
 
@@ -130,22 +120,30 @@ void init_supported_writers(void)
                writers[i].init(&writers[i]);
 }
 
-int check_writer_arg(const char *arg)
+void *check_writer_arg(char *wa, int *writer_num)
 {
-       int i, ret = -E_WRITE_COMMON_SYNTAX;
-       char *a = para_strdup(arg), *p = strchr(a, ':');
-       if (p)
-               *p = '\0';
-       p++;
+       int i;
+
+       *writer_num = -E_WRITE_COMMON_SYNTAX;
+       PARA_INFO_LOG("checking  %s\n", wa);
        FOR_EACH_WRITER(i) {
-               if (strcmp(writer_names[i], a))
+               const char *name = writer_names[i];
+               size_t len = strlen(name);
+               char c;
+               if (strlen(wa) < len)
+                       continue;
+               if (strncmp(name, wa, len))
+                       continue;
+               c = wa[len];
+               if (c && c != ' ')
                        continue;
-               ret = i;
-               goto out;
+               if (c && !writers[i].parse_config)
+                       return NULL;
+               *writer_num = i;
+               return writers[i].parse_config(c? wa + len + 1 : "");
        }
-out:
-       free(a);
-       return ret;
+       PARA_ERROR_LOG("%s", "writer not found\n");
+       return NULL;
 }
 
 struct writer_node_group *setup_default_wng(void)
@@ -158,7 +156,10 @@ struct writer_node_group *setup_default_wng(void)
        else
                default_writer = 1;
        wng->writer_nodes[0].writer = &writers[default_writer];
-       PARA_INFO_LOG("using default writer: %s\n",
+       sprintf(wng->writer_nodes[0].task.status, "%s",
                writer_names[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;
 }