audiod: get rid of all calls to gettimeofday().

[paraslash.git] / write.c

diff --git a/write.c b/write.c
index 13b15a1d94034f95ae73fed94b3faba59fbf24eb..2efe07ce730264be610fc35adc2bc1cdd9fc0721 100644 (file)
--- a/write.c
+++ b/write.c
@@ -43,7 +43,7 @@ struct initial_delay_task {
        struct task task;
 };
 
-struct gengetopt_args_info conf;
+static struct gengetopt_args_info conf;
 struct stdin_task sit;
 struct check_wav_task cwt;
 struct initial_delay_task idt;
@@ -66,6 +66,8 @@ static void check_wav_pre_select(struct sched *s, struct task *t)
                t->ret = *cwt->eof? -E_PREMATURE_END : 1;
                return;
        }
+       cwt->channels = 2;
+       cwt->sample_rate = 44100;
        a = (unsigned char*)cwt->buf;
        t->ret = -E_NO_WAV_HEADER;
        if (a[0] != 'R' || a[1] != 'I' || a[2] != 'F' || a[3] != 'F')
@@ -124,8 +126,8 @@ 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.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",
@@ -140,23 +142,36 @@ static struct writer_node_group *check_args(void)
                goto out;
        }
        wng = 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;
+               wng->writer_nodes[i].conf = check_writer_arg(
+                       conf.writer_arg[i], &writer_num);
+               if (!wng->writer_nodes[i].conf)
                        goto out;
-               wng->writer_nodes[i].writer = &writers[ret];
+               wng->writer_nodes[i].writer = &writers[writer_num];
                sprintf(wng->writer_nodes[i].task.status, "%s",
-                       writer_names[ret]);
+                       writer_names[writer_num]);
        }
        ret = 1;
 out:
-       if (ret > 0) {
+       if (ret > 0)
                return wng;
-       }
        free(wng);
        return NULL;
 }
 
+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);
+       wng_destroy(g);
+}
+
+
 static void idt_event_handler(struct task *t)
 {
        int ret;
@@ -165,8 +180,8 @@ static void idt_event_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;
        ret = wng_open(wng);
        if (ret < 0) {
                PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
@@ -182,10 +197,10 @@ static void cwt_event_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.event_handler = idt_event_handler;
@@ -199,13 +214,15 @@ int main(int argc, char *argv[])
        struct sched s;
 
        cmdline_parser(argc, argv, &conf);
-       wng = check_args();
-       if (!wng)
-               goto out;
        init_supported_writers();
        init_sched();
 
+       wng = check_args();
+       if (!wng)
+               goto out;
        stdin_set_defaults(&sit);
+       if (conf.bufsize_given)
+               sit.bufsize = conf.bufsize_arg;
        sit.buf = para_malloc(sit.bufsize),
        register_task(&sit.task);