X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3_afh.c;h=471efd99db36634e1db33763be94ef70c4ae6de4;hp=382b0e9091c4cb3d6679f9779ad6faff9fb1fe15;hb=6bded356ec89b1344049ff702e6c6babaeccd439;hpb=073076f4e54b35ee96cfab0c4a47b40126f24213

diff --git a/mp3_afh.c b/mp3_afh.c
index 382b0e90..471efd99 100644
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2003 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2003 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file mp3_afh.c para_server's mp3 audio format handler */
 
@@ -67,8 +63,6 @@ static const int mp3info_bitrate[2][3][14] = {
 };
 
 static const int frame_size_index[] = {24000, 72000, 72000};
-static const char *mode_text[] = {"stereo", "joint stereo", "dual channel", "mono", "invalid"};
-
 #ifdef HAVE_ID3TAG
 
 #include <id3tag.h>
@@ -238,7 +232,7 @@ static int replace_tag(char const *id, const char *val, struct id3_tag *id3_t,
 	if (!val || !*val)
 		return 0;
 	fr = id3_frame_new(id);
-	PARA_DEBUG_LOG("frame desc: %s, %d fields\n", fr->description, fr->nfields);
+	PARA_DEBUG_LOG("frame desc: %s, %u fields\n", fr->description, fr->nfields);
 
 	/* Frame 0 contains the encoding. We always use UTF-8. */
 	field = id3_frame_field(fr, 0);
@@ -437,10 +431,13 @@ static int header_frequency(struct mp3header *h)
 	return frequencies[h->version][h->freq];
 }
 
-static const char *header_mode(struct mp3header *h)
+static const char *header_mode(const struct mp3header *h)
 {
-	if (h->mode > 4)
-		h->mode = 4; /* invalid */
+	const char * const mode_text[] = {"stereo", "joint stereo",
+		"dual channel", "mono"};
+
+	if (h->mode >= ARRAY_SIZE(mode_text))
+		return "invalid";
 	return mode_text[h->mode];
 }
 
@@ -657,12 +654,12 @@ static int mp3_read_info(unsigned char *map, size_t numbytes, int fd,
 	tv_divide(afhi->chunks_total, &total_time, &afhi->chunk_tv);
 	PARA_DEBUG_LOG("%" PRIu32 "chunks, each %lums\n", afhi->chunks_total,
 		tv2ms(&afhi->chunk_tv));
+	set_max_chunk_size(afhi);
 	ret = mp3_get_id3(map, numbytes, fd, &afhi->tags);
 	afhi->techinfo = make_message("%cbr, %s, %s tags", vbr? 'v' : 'c',
 		header_mode(&header), tag_versions[ret]);
 	return 1;
 err_out:
-	PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	free(afhi->chunk_table);
 	return ret;
 }
@@ -690,7 +687,7 @@ static const char * const mp3_suffixes[] = {"mp3", NULL};
  *
  * \param afh pointer to the struct to initialize
  */
-void mp3_init(struct audio_format_handler *afh)
+void mp3_afh_init(struct audio_format_handler *afh)
 {
 	afh->get_file_info = mp3_get_file_info;
 	afh->suffixes = mp3_suffixes;