X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=wav.c;h=ad3458d1b2be3bbebd96fb71b27af2af5d33fca5;hb=89a0e510df07bc7210ca9e73381763fdd183df75;hp=52a97af06aac34f6e3b4601596104db5bc1665bd;hpb=c8862b9e246b4ef6ff1fe103946e18cf2537ecde;p=paraslash.git

diff --git a/wav.c b/wav.c
index 52a97af0..ad3458d1 100644
--- a/wav.c
+++ b/wav.c
@@ -48,6 +48,7 @@ static void make_wav_header(unsigned int channels, unsigned int samplerate,
 	int bytespersec = channels * samplerate * BITS / 8;
 	int align = channels * BITS / 8;
 
+	assert(channels);
 	PARA_DEBUG_LOG("writing wave header: %d channels, %d KHz\n", channels, samplerate);
 	memset(headbuf, 0, WAV_HEADER_LEN);
 	memcpy(headbuf, "RIFF", 4);
@@ -71,6 +72,8 @@ static ssize_t wav_convert(char *inbuf, size_t len, struct filter_node *fn)
 	int *bof = fn->private_data;
 
 	if (*bof) {
+		if (!len)
+			return 0;
 		make_wav_header(fn->fc->channels, fn->fc->samplerate, fn);
 		fn->loaded = WAV_HEADER_LEN;
 		*bof = 0;
@@ -99,6 +102,7 @@ static void wav_open(struct filter_node *fn)
 	fn->buf = para_malloc(fn->bufsize);
 	fn->private_data = para_malloc(sizeof(int));
 	bof = fn->private_data;
+	fn->loaded = 0;
 	*bof = 1;
 	PARA_INFO_LOG("wav filter node: %p, output buffer: %p, loaded: %zd\n",
 		fn, fn->buf, fn->loaded);
@@ -109,7 +113,7 @@ static void wav_open(struct filter_node *fn)
  *
  * \param f struct to initialize
  */
-void wav_init(struct filter *f)
+void wav_filter_init(struct filter *f)
 {
 	f->convert = wav_convert;
 	f->close = wav_close;