X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wav.c;h=5ab3bb3937385a855e7dd5fecdcc50635e3d1ac2;hp=01ac440239f1e4815a63365e098616d209831924;hb=41f13bf6cac519b46ed24892e2c84384ef5dc500;hpb=4b4c68de8d7390f966e46d9402d5499d2e8ee227 diff --git a/wav.c b/wav.c index 01ac4402..5ab3bb39 100644 --- 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: %d\n", + PARA_INFO_LOG("wav filter node: %p, output buffer: %p, loaded: %zd\n", fn, fn->buf, fn->loaded); }