Kill global close_filters().

[paraslash.git] / wav_filter.c

diff --git a/wav_filter.c b/wav_filter.c
index 91d87e7ae03d6086c0db7e152b389eba3f6dbee7..4f12a34c03fe5a74d58e772ba76df23f40fa5735 100644 (file)
--- a/wav_filter.c
+++ b/wav_filter.c
@@ -51,30 +51,6 @@ 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);
@@ -118,7 +94,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;
@@ -150,23 +125,21 @@ static void wav_post_select(__a_unused struct sched *s, struct task *t)
        ret = -E_WAV_SUCCESS;
 err:
        t->error = ret;
-       wav_close(fn);
        if (ret == -E_WAV_SUCCESS)
                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;