X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=mp3.c;h=ab8df7dfb942da7ffa1e4e87ef58e8d3c9bcc50f;hb=df445c2b07824c950c38d06e74f2b84843bbeb6c;hp=c2d0f63e7ccd0dbe9a4c6727d4979b1055acba85;hpb=2ed89c59f0efcd0a2763f47c7d3455663241e623;p=paraslash.git

diff --git a/mp3.c b/mp3.c
index c2d0f63e..ab8df7df 100644
--- a/mp3.c
+++ b/mp3.c
@@ -31,7 +31,6 @@
 #include "server.cmdline.h"
 #include "server.h"
 #include "afs.h"
-#include "gcc-compat.h"
 #include "error.h"
 
 /** \cond some defines and structs which are only used in this file */
@@ -102,7 +101,7 @@ static int mp3info_bitrate[2][3][14] = {
 };
 
 static int frame_size_index[] = {24000, 72000, 72000};
-static char *mode_text[] = {"stereo", "joint stereo", "dual channel", "mono", "invalid"};
+static const char *mode_text[] = {"stereo", "joint stereo", "dual channel", "mono", "invalid"};
 
 static struct mp3info mp3;
 static char mp3buf[8192];
@@ -126,7 +125,7 @@ static int header_frequency(struct mp3header *h)
 	return frequencies[h->version][h->freq];
 }
 
-static char *header_mode(struct mp3header *h)
+static const char *header_mode(struct mp3header *h)
 {
 	if (h->mode > 4)
 		h->mode = 4; /* invalid */
@@ -412,7 +411,8 @@ static int mp3_read_info(void)
 	tv_divide(fcount, &total_time, &af->chunk_tv);
 	rewind(mp3.file);
 	PARA_DEBUG_LOG("chunk_time: %lu\n", af->chunk_tv.tv_usec);
-	tv_scale(10, &af->chunk_tv, &af->eof_tv);
+	tv_scale(30, &af->chunk_tv, &af->eof_tv);
+	PARA_DEBUG_LOG("eof timeout: %lu\n", tv2ms(&af->eof_tv));
 	return 1;
 }