From: Andre Noll <maan@systemlinux.org>
Date: Sat, 24 Mar 2007 17:25:08 +0000 (+0100)
Subject: Merge /home/maan/scm/paraslash_fml/paraslash
X-Git-Tag: v0.2.16~7^2~5
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=a15abef9eee4b8369b3ce8fcaad91a2e0c879df5;hp=ebbbe8480434cba3011bba3a3e93f77ea7bd74a7

Merge /home/maan/scm/paraslash_fml/paraslash
---

diff --git a/CREDITS b/CREDITS
index aaf06e2f..ff5d2c4a 100644
--- a/CREDITS
+++ b/CREDITS
@@ -46,6 +46,8 @@ Guillaume Outters <guillaume.outters@free.fr> (mosx-mpg123)
 
 Christian Reißmann (design)
 
+Gerrit Renker <gerrit@erg.abdn.ac.uk> (dccp)
+
 Michael Smith <msmith@xiph.org> (vcut)
 
 Cedric Tefft <cedric@earthling.net> (mp3info)
diff --git a/Makefile.in b/Makefile.in
index 3bd3add2..230c0117 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,8 +43,6 @@ CPPFLAGS += -Wshadow
 
 BINARIES = para_server para_client para_gui para_audioc para_recv \
 	para_filter para_write @extra_binaries@
-all_man_binaries := para_server para_client para_gui para_audioc para_recv \
-        para_filter para_write  para_fade para_sdl_gui para_audiod
 man_binaries := $(filter-out para_dbadm para_slider para_krell.so, $(BINARIES))
 man_pages := $(patsubst %, man/man1/%.1, $(man_binaries))
 man_pages_html := $(patsubst %, man/html/%.html, $(man_binaries))
@@ -53,8 +51,6 @@ PICS := $(wildcard pics/paraslash/*.jpg)
 gengetopts := $(wildcard *.ggo)
 gengetopts_c := $(gengetopts:.ggo=.cmdline.c)
 gengetopts_h := $(gengetopts:.ggo=.cmdline.h)
-all_c_files := $(wildcard *.c)
-c_sources := $(filter-out $(gengetopts_c), $(all_c_files))
 grutatxt := COPYING NEWS README.mysql CREDITS INSTALL README FEATURES GPL
 grutatxt_html := $(grutatxt:=.html)
 html_in := $(wildcard web/*.in.html)
diff --git a/NEWS b/NEWS
index 4d027ebb..9277d1cf 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,7 @@ of other improvements/changes/bugfixes also made it into the release.
 	- fix a bug in para_filter that caused decoding of aac files
 	  to start only after a few seconds.
 	- fix osx_writer hangs
+	- simplified dccp code (thanks to Gerrit Renker)
 
 -----------------------------------------
 0.2.15 (2007-02-16) "inductive resonance"
diff --git a/audiod.c b/audiod.c
index 5515e527..85aa517a 100644
--- a/audiod.c
+++ b/audiod.c
@@ -636,7 +636,7 @@ static void audiod_pre_select(struct sched *s, __a_unused struct task *t)
 			s->timeout = min_delay;
 			continue;
 		}
-		PARA_INFO_LOG("inital delay: %lu ms left\n", tv2ms(&diff));
+		PARA_INFO_LOG("initial delay: %lu ms left\n", tv2ms(&diff));
 		if (tv_diff(&s->timeout, &diff, NULL) > 0) {
 			s->timeout = diff;
 		}
diff --git a/mp3_afh.c b/mp3_afh.c
index ffabfe4e..cf507ec2 100644
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -240,11 +240,9 @@ static int mp3_seek_next_header(unsigned char *map, off_t numbytes, off_t *fpos)
 	struct mp3header h, h2;
 	long valid_start = 0;
 
-	while (1) {
-		while ((*fpos)++ < numbytes && map[*fpos] != 0xff)
-			;
-		if (*fpos >= numbytes)
-			return 0;
+	for (; *fpos < numbytes; (*fpos)++) {
+		if (map[*fpos] != 0xff)
+			continue;
 		valid_start = *fpos;
 		first_len = get_header(map, numbytes, fpos, &h);
 		if (first_len <= 0)
@@ -263,6 +261,7 @@ static int mp3_seek_next_header(unsigned char *map, off_t numbytes, off_t *fpos)
 			return first_len;
 		}
 	}
+	return 0;
 }
 
 static void mp3_get_id3(unsigned char *map, off_t numbytes, off_t *fpos)
diff --git a/vss.c b/vss.c
index 8e9c17bf..cb2d16c8 100644
--- a/vss.c
+++ b/vss.c
@@ -268,7 +268,8 @@ static void vss_get_audio_file(void)
 		audio_file = open(sl[i], O_RDONLY);
 		if (audio_file < 0)
 			continue;
-		if (fstat(audio_file, &file_status) == -1) {
+		if (fstat(audio_file, &file_status) == -1 ||
+				!file_status.st_size) {
 			close(audio_file);
 			continue;
 		}