fix dccp sender/receiver

[paraslash.git] / write.c

diff --git a/write.c b/write.c
index b692ac5080af8dfee4efd79a95048e6c8ad6999d..fc50040a28c07df608c551a56824188b7a383bf9 100644 (file)
--- a/write.c
+++ b/write.c
@@ -34,7 +34,7 @@ struct check_wav_task {
        size_t *loaded;
        int *eof;
        unsigned channels;
        size_t *loaded;
        int *eof;
        unsigned channels;

-       unsigned sample_rate;
+       unsigned samplerate;

        struct task task;
 };
 
        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.
  */
  * \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;
 {
        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;
                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];
        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;
        *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)
 }
 
 static void initial_delay_pre_select(struct sched *s, struct task *t)


@@ -161,6 +161,16 @@ out:
        return NULL;
 }
 
        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);
+}
+
+

 static void idt_event_handler(struct task *t)
 {
        int ret;
 static void idt_event_handler(struct task *t)
 {
        int ret;


@@ -170,6 +180,9 @@ static void idt_event_handler(struct task *t)
        wng->buf = sit.buf;
        wng->loaded = &sit.loaded;
        wng->input_eof = &sit.eof;
        wng->buf = sit.buf;
        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));
        ret = wng_open(wng);
        if (ret < 0) {
                PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));