Kill global close_filters().

[paraslash.git] / wav_filter.c

diff --git a/wav_filter.c b/wav_filter.c
index eada2434d8be0dc08a1c7d9cacef8e386278d037..4f12a34c03fe5a74d58e772ba76df23f40fa5735 100644 (file)
--- a/wav_filter.c
+++ b/wav_filter.c
@@ -27,10 +27,9 @@
 #define BITS 16
 
 static void make_wav_header(unsigned int channels, unsigned int samplerate,
-               struct filter_node *fn)
+               char *headbuf)
 {
 
-       char *headbuf = fn->buf;
        unsigned int size = 0x7fffffff;
        int bytespersec = channels * samplerate * BITS / 8;
        int align = channels * BITS / 8;
@@ -52,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);
-               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);
@@ -98,14 +73,75 @@ static void wav_open(struct filter_node *fn)
                fn, fn->buf, fn->loaded);
 }
 
+static void wav_pre_select(struct sched *s, struct task *t)
+{
+       struct filter_node *fn = container_of(t, struct filter_node, task);
+       size_t iqs = btr_get_input_queue_size(fn->btrn);
+
+       t->error = 0;
+       if (iqs == 0)
+               return;
+       s->timeout.tv_sec = 0;
+       s->timeout.tv_usec = 1;
+}
+
+static void wav_post_select(__a_unused struct sched *s, struct task *t)
+{
+       struct filter_node *fn = container_of(t, struct filter_node, task);
+       struct btr_node *btrn = fn->btrn;
+       size_t iqs = btr_get_input_queue_size(btrn);
+       int ret;
+       char *header, *buf;
+       int32_t rate, ch;
+
+       t->error = 0;
+       if (iqs == 0) {
+               ret = -E_WAV_EOF;
+               if (btr_no_parent(btrn))
+                       goto err;
+               return;
+       }
+       ret = btr_exec_up(btrn, "samplerate", &buf);
+       if (ret < 0) {
+               ret = -E_WAV_BAD_FC;
+               goto err;
+       }
+       ret = para_atoi32(buf, &rate);
+       free(buf);
+       if (ret < 0)
+               goto err;
+       ret = btr_exec_up(btrn, "channels", &buf);
+       if (ret < 0) {
+               ret = -E_WAV_BAD_FC;
+               goto err;
+       }
+       ret = para_atoi32(buf, &ch);
+       free(buf);
+       if (ret < 0)
+               goto err;
+       header = para_malloc(WAV_HEADER_LEN);
+       make_wav_header(ch, rate, header);
+       btr_add_output(header, WAV_HEADER_LEN, btrn);
+       ret = -E_WAV_SUCCESS;
+err:
+       t->error = ret;
+       if (ret == -E_WAV_SUCCESS)
+               btr_splice_out_node(btrn);
+       else {
+               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;
+       f->post_select = wav_post_select;
 }