Merge ../paraslash.fml/paraslash

[paraslash.git] / wav.c

diff --git a/wav.c b/wav.c
index 879b1887b069b43b05101ea52e602a4c9c12add3..5ab3bb3937385a855e7dd5fecdcc50635e3d1ac2 100644 (file)
--- a/wav.c
+++ b/wav.c
@@ -21,6 +21,7 @@
 #include "para.h"
 
 #include "list.h"
+#include "sched.h"
 #include "filter.h"
 #include "string.h"
 
@@ -66,12 +67,12 @@ static ssize_t wav_convert(char *inbuf, size_t len, struct filter_node *fn)
        int *bof = fn->private_data;
 
        if (*bof) {
-               make_wav_header(fn->fci->channels, fn->fci->samplerate, fn);
+               make_wav_header(fn->fc->channels, fn->fc->samplerate, fn);
                fn->loaded = WAV_HEADER_LEN;
                *bof = 0;
 //             return 0;
        }
-       copy = MIN(len, fn->bufsize - fn->loaded);
+       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);
@@ -95,7 +96,7 @@ static void wav_open(struct filter_node *fn)
        fn->private_data = para_malloc(sizeof(int));
        bof = fn->private_data;
        *bof = 1;
-       PARA_DEBUG_LOG("wav filter node: %p, output buffer: %p, loaded: %zd\n",
+       PARA_INFO_LOG("wav filter node: %p, output buffer: %p, loaded: %zd\n",
                fn, fn->buf, fn->loaded);
 }