X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wav.c;h=b955695f70bce73aea60df566722658089f3661a;hp=647be101dc7e89e8b5fe73e12899f7e2520a083b;hb=607ac63646d7c31aa1792dcf1d9a60e498654376;hpb=2ed89c59f0efcd0a2763f47c7d3455663241e623 diff --git a/wav.c b/wav.c index 647be101..b955695f 100644 --- a/wav.c +++ b/wav.c @@ -18,7 +18,6 @@ /** \file wav.c a filter that inserts a wave header */ -#include "gcc-compat.h" #include "para.h" #include "list.h" @@ -67,12 +66,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); @@ -96,7 +95,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_DEBUG_LOG("wav filter node: %p, output buffer: %p, loaded: %zd\n", fn, fn->buf, fn->loaded); }