introduce input_eof and ouput_eof

[paraslash.git] / write.c

diff --git a/write.c b/write.c
index 508aee790b728b169b4ac5b82832d8385a833f10..a3cd4b5d640b5467ce762f8d4e2fb12450c0dc7a 100644 (file)
--- a/write.c
+++ b/write.c
@@ -32,6 +32,7 @@ INIT_WRITE_ERRLISTS;
 struct check_wav_task {
        char *buf;
        size_t *loaded;
+       int *eof;
        unsigned channels;
        unsigned sample_rate;
        struct task task;
@@ -53,8 +54,8 @@ static struct writer_node_group *wng;
 /**
  * test if audio buffer contains a valid wave header
  *
- * \return If not, return 0, otherwise, store number of channels and sample rate
- * in struct conf and return WAV_HEADER_LEN.
+ * \return If not, return -E_NO_WAV_HEADER, otherwise, return zero. If
+ * there is less than WAV_HEADER_LEN bytes awailable, return one.
  */
 static void check_wav_pre_select(struct sched *s, struct task *t)
 {
@@ -62,7 +63,7 @@ static void check_wav_pre_select(struct sched *s, struct task *t)
        unsigned char *a;
 
        if (*cwt->loaded < WAV_HEADER_LEN) {
-               t->ret = 1;
+               t->ret = *cwt->eof? -E_PREMATURE_END : 1;
                return;
        }
        a = (unsigned char*)cwt->buf;
@@ -73,7 +74,7 @@ static void check_wav_pre_select(struct sched *s, struct task *t)
        cwt->sample_rate = 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);
-       t->ret = 0;
+       t->ret = -E_WAV_HEADER_SUCCESS;
        PARA_INFO_LOG("channels: %d, sample_rate: %d\n", cwt->channels, cwt->sample_rate);
 }
 
@@ -82,11 +83,10 @@ static void initial_delay_pre_select(struct sched *s, struct task *t)
        struct initial_delay_task *idt = t->private_data;
        struct timeval diff;
 
-       PARA_ERROR_LOG("task %p, ret: %d\n", t, t->ret);
        t->ret = -E_NO_DELAY;
        if (!idt->start_time.tv_sec && !idt->start_time.tv_usec)
                return;
-       t->ret = 0; /* timeout */
+       t->ret = -E_DELAY_TIMEOUT;
        if (tv_diff(&s->now, &idt->start_time, &diff) > 0)
                return;
        t->ret = 1;
@@ -145,6 +145,8 @@ static struct writer_node_group *check_args(void)
                if (ret < 0)
                        goto out;
                wng->writer_nodes[i].writer = &writers[ret];
+               sprintf(wng->writer_nodes[i].task.status, "%s",
+                       writer_names[ret]);
        }
        ret = 1;
 out:
@@ -154,13 +156,15 @@ out:
        return NULL;
 }
 
-static void idt_error_handler(struct task *t)
+static void idt_event_handler(struct task *t)
 {
-       PARA_ERROR_LOG("task %p, ret: %d\n", t, t->ret);
        int ret;
+
+       PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret));
        unregister_task(t);
        wng->buf = sit.buf;
        wng->loaded = &sit.loaded;
+       wng->input_eof = &sit.eof;
        ret = wng_open(wng);
        if (ret < 0) {
                PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
@@ -168,35 +172,25 @@ static void idt_error_handler(struct task *t)
        }
 }
 
-static void cwt_error_handler(struct task *t)
+static void cwt_event_handler(struct task *t)
 {
-       PARA_ERROR_LOG("task %p, ret: %d\n", t, t->ret);
-       if (t->ret < 0) {
+       if (t->ret != -E_NO_WAV_HEADER && t->ret != -E_WAV_HEADER_SUCCESS) {
                PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret));
-               if (t->ret != -E_NO_WAV_HEADER && t->ret != -E_PRE_EOF)
-                       exit(EXIT_FAILURE);
-               if (t->ret == -E_PRE_EOF) {
-                       conf.channels_arg = cwt.channels;
-                       conf.sample_rate_arg = cwt.sample_rate;
-               }
+               exit(EXIT_FAILURE);
        }
+       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;
+       }
        idt.task.pre_select = initial_delay_pre_select;
        idt.task.private_data = &idt;
-       idt.task.error_handler = idt_error_handler;
-       idt.task.flags = PRE_EOF_IS_ERROR;
+       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);
-       PARA_INFO_LOG("task %p, ret: %d\n", t, t->ret);
-       if (t->ret < 0)
-               PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret));
-       wng->eof = 1;
-}
-
 int main(int argc, char *argv[])
 {
        int ret = -E_WRITE_SYNTAX;
@@ -209,22 +203,17 @@ 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.flags = POST_EOF_IS_ERROR;
-       sit.task.private_data = &sit;
+       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.task.flags = PRE_EOF_IS_ERROR;
+       cwt.eof = &sit.eof;
+       sprintf(cwt.task.status, "check wav");
        register_task(&cwt.task);
 
        s.default_timeout.tv_sec = 1;