convert para_audiod to the new scheduler.

[paraslash.git] / write.c

diff --git a/write.c b/write.c
index 3e5a97e8076e9a3d70bbb0d5386ee9b605a4cae7..a3cd4b5d640b5467ce762f8d4e2fb12450c0dc7a 100644 (file)
--- a/write.c
+++ b/write.c
@@ -150,14 +150,13 @@ static struct writer_node_group *check_args(void)
        }
        ret = 1;
 out:
-       if (ret > 0) {
+       if (ret > 0)
                return wng;
-       }
        free(wng);
        return NULL;
 }
 
-static void idt_error_handler(struct task *t)
+static void idt_event_handler(struct task *t)
 {
        int ret;
 
@@ -165,8 +164,7 @@ 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;
        ret = wng_open(wng);
        if (ret < 0) {
                PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
@@ -174,7 +172,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));
@@ -188,20 +186,11 @@ static void cwt_error_handler(struct task *t)
        }
        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;
@@ -214,19 +203,13 @@ int main(int argc, char *argv[])
        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);
+       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;