X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3_afh.c;h=42dd7539f647b1e1051870f673fc2f300cfa4a4d;hp=47298b83805729825ab8cee3bd62c72f263179a2;hb=42f69f545fad18480d728bb6f25273976a0c01e0;hpb=015c939d323aad2b959f8d60befc3939ebc299ee

diff --git a/mp3_afh.c b/mp3_afh.c
index 47298b83..42dd7539 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 */
 
@@ -238,7 +234,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);
@@ -657,12 +653,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;
 }
@@ -683,14 +679,14 @@ static int mp3_get_file_info(char *map, size_t numbytes, int fd,
 	return 1;
 }
 
-static const char* mp3_suffixes[] = {"mp3", NULL};
+static const char * const mp3_suffixes[] = {"mp3", NULL};
 
 /**
  * the init function of the mp3 audio format handler
  *
  * \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;