08_refactor-makesock.diff
[paraslash.git] / wav_filter.c
index 7a3c59b..5b879f2 100644 (file)
 #include "string.h"
 #include "portable_io.h"
 
-/** size of the output buffer */
-#define WAV_OUTBUF_SIZE 81920
-/** a wav header is always 44 bytes */
+/** A wav header is always 44 bytes. */
 #define WAV_HEADER_LEN 44
-/** always write 16 bit header */
+/** Always write 16 bit header. */
 #define BITS 16
 
 static void make_wav_header(unsigned int channels, unsigned int samplerate,
@@ -51,34 +49,8 @@ static void make_wav_header(unsigned int channels, unsigned int samplerate,
        write_u32(headbuf + 40, size - 44); /* chunk size */
 }
 
-static ssize_t wav_convert(char *inbuf, size_t len, struct filter_node *fn)
-{
-       size_t copy;
-       int *bof = fn->private_data;
-
-       if (*bof) {
-               if (!len)
-                       return 0;
-               if (!fn->fc->channels || !fn->fc->samplerate) {
-                       PARA_ERROR_LOG("%s\n", para_strerror(E_WAV_BAD_FC));
-                       return -E_WAV_BAD_FC;
-               }
-               make_wav_header(fn->fc->channels, fn->fc->samplerate, fn->buf);
-               fn->loaded = WAV_HEADER_LEN;
-               *bof = 0;
-//             return 0;
-       }
-       copy = PARA_MIN(len, fn->bufsize - fn->loaded);
-       memmove(fn->buf + fn->loaded, inbuf, copy);
-       fn->loaded += copy;
-//     PARA_DEBUG_LOG("len = %d, copy = %d\n", len, copy);
-       return copy;
-}
-
 static void wav_close(struct filter_node *fn)
 {
-       free(fn->buf);
-       fn->buf = NULL;
        free(fn->private_data);
        fn->private_data = NULL;
 }
@@ -87,14 +59,9 @@ static void wav_open(struct filter_node *fn)
 {
        int *bof;
 
-       fn->bufsize = WAV_OUTBUF_SIZE;
-       fn->buf = para_malloc(fn->bufsize);
        fn->private_data = para_malloc(sizeof(int));
        bof = fn->private_data;
-       fn->loaded = 0;
        *bof = 1;
-       PARA_INFO_LOG("wav filter node: %p, output buffer: %p, loaded: %zd\n",
-               fn, fn->buf, fn->loaded);
 }
 
 static void wav_pre_select(struct sched *s, struct task *t)
@@ -118,7 +85,6 @@ static void wav_post_select(__a_unused struct sched *s, struct task *t)
        char *header, *buf;
        int32_t rate, ch;
 
-
        t->error = 0;
        if (iqs == 0) {
                ret = -E_WAV_EOF;
@@ -147,27 +113,24 @@ static void wav_post_select(__a_unused struct sched *s, struct task *t)
        header = para_malloc(WAV_HEADER_LEN);
        make_wav_header(ch, rate, header);
        btr_add_output(header, WAV_HEADER_LEN, btrn);
-       btr_pushdown(btrn);
        ret = -E_WAV_SUCCESS;
 err:
        t->error = ret;
-       wav_close(fn);
        if (ret == -E_WAV_SUCCESS)
-               ret = btr_splice_out_node(btrn);
+               btr_splice_out_node(btrn);
        else {
-               btr_del_node(btrn);
+               btr_remove_node(btrn);
                PARA_ERROR_LOG("%s\n", para_strerror(-ret));
        }
 }
 
 /**
- * the init function of the wav filter
+ * The init function of the wav filter.
  *
- * \param f struct to initialize
+ * \param f Structure to initialize.
  */
 void wav_filter_init(struct filter *f)
 {
-       f->convert = wav_convert;
        f->close = wav_close;
        f->open = wav_open;
        f->pre_select = wav_pre_select;