overview.sk: update to 0.2.13
[paraslash.git] / write.c
diff --git a/write.c b/write.c
index 2efe07c..66cdd7f 100644 (file)
--- a/write.c
+++ b/write.c
@@ -34,7 +34,7 @@ struct check_wav_task {
        size_t *loaded;
        int *eof;
        unsigned channels;
-       unsigned sample_rate;
+       unsigned samplerate;
        struct task task;
 };
 
@@ -57,7 +57,7 @@ static struct writer_node_group *wng;
  * \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)
+static void check_wav_pre_select(__a_unused struct sched *s, struct task *t)
 {
        struct check_wav_task *cwt = t->private_data;
        unsigned char *a;
@@ -67,17 +67,17 @@ static void check_wav_pre_select(struct sched *s, struct task *t)
                return;
        }
        cwt->channels = 2;
-       cwt->sample_rate = 44100;
+       cwt->samplerate = 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')
                return;
        cwt->channels = (unsigned) a[22];
-       cwt->sample_rate = a[24] + (a[25] << 8) + (a[26] << 16) + (a[27] << 24);
+       cwt->samplerate = 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 = -E_WAV_HEADER_SUCCESS;
-       PARA_INFO_LOG("channels: %d, sample_rate: %d\n", cwt->channels, cwt->sample_rate);
+       PARA_INFO_LOG("channels: %d, sample rate: %d\n", cwt->channels, cwt->samplerate);
 }
 
 static void initial_delay_pre_select(struct sched *s, struct task *t)
@@ -89,7 +89,7 @@ static void initial_delay_pre_select(struct sched *s, struct task *t)
        if (!idt->start_time.tv_sec && !idt->start_time.tv_usec)
                return;
        t->ret = -E_DELAY_TIMEOUT;
-       if (tv_diff(&s->now, &idt->start_time, &diff) > 0)
+       if (tv_diff(now, &idt->start_time, &diff) > 0)
                return;
        t->ret = 1;
        if (tv_diff(&s->timeout , &diff, NULL) > 0)
@@ -150,8 +150,6 @@ static struct writer_node_group *check_args(void)
                if (!wng->writer_nodes[i].conf)
                        goto out;
                wng->writer_nodes[i].writer = &writers[writer_num];
-               sprintf(wng->writer_nodes[i].task.status, "%s",
-                       writer_names[writer_num]);
        }
        ret = 1;
 out:
@@ -168,7 +166,6 @@ static void wng_event_handler(struct task *t)
        PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret));
        unregister_task(t);
        wng_close(g);
-       wng_destroy(g);
 }
 
 
@@ -182,6 +179,8 @@ static void idt_event_handler(struct task *t)
        wng->loaded = &sit.loaded;
        wng->input_eof = &sit.eof;
        wng->task.event_handler = wng_event_handler;
+       wng->channels = &cwt.channels;
+       wng->samplerate = &cwt.samplerate;
        ret = wng_open(wng);
        if (ret < 0) {
                PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
@@ -215,7 +214,6 @@ int main(int argc, char *argv[])
 
        cmdline_parser(argc, argv, &conf);
        init_supported_writers();
-       init_sched();
 
        wng = check_args();
        if (!wng)