Merge /home/maan/scm/paraslash_fml/paraslash

diff --git a/CREDITS b/CREDITS
index aaf06e2ffe4f2495fa5337e98db8fb529e15dc9d..ff5d2c4aa113cfa4485fd1690354018a41341b64 100644 (file)
--- 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 3bd3add248600ec1bcd7f26e177c2640040deadb..230c01177e35f07b23fd76d24fc8470b60cc6bb4 100644 (file)
--- 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 4d027ebbc1d9ef072e76ce4fa2711d7661928725..9277d1cfd0701e497a84c188710c51848b7314dd 100644 (file)
--- 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 5515e5274f6ae152367b39f1a257c5fe5712fa6a..85aa517ac536ae6796c84f5605556364af299234 100644 (file)
--- 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 ffabfe4eb1479b0d57849ddbae65a583d5013760..cf507ec2b371c187e18123b1cdc5e4be07f6547b 100644 (file)
--- 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 8e9c17bf48a623bd883274ce5f58dfd6a463f264..cb2d16c8d0c84843de9f5be213ed09b752aee890 100644 (file)
--- 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;
                }