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

diff --git a/wav.c b/wav.c
index 308c8bc1..ad3458d1 100644
--- a/wav.c
+++ b/wav.c
@@ -1,19 +1,7 @@
 /*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file wav.c a filter that inserts a wave header */
@@ -51,7 +39,8 @@
  */
 #define WRITE_U16(buf, x) (buf)[0] = (unsigned char)((x) & 0xff);
 
-static void make_wav_header(int channels, int samplerate, struct filter_node *fn)
+static void make_wav_header(unsigned int channels, unsigned int samplerate,
+		struct filter_node *fn)
 {
 
 	char *headbuf = fn->buf;
@@ -59,6 +48,7 @@ static void make_wav_header(int channels, int samplerate, struct filter_node *fn
 	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);
@@ -82,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;
@@ -110,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);
@@ -120,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;