X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3_afh.c;h=471efd99db36634e1db33763be94ef70c4ae6de4;hp=5f73785ee39084c2ef548dc8bc36ac54ae1cd5c6;hb=ba83a291cd486e8ab53ac64d81b17d8f5705d715;hpb=16181209926798db9004f43ba9261c476a36b6bf

diff --git a/mp3_afh.c b/mp3_afh.c
index 5f73785e..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);
@@ -340,29 +334,27 @@ static int mp3_rewrite_tags(const char *map, size_t mapsize,
 	if (v2_tag) {
 		PARA_NOTICE_LOG("replacing id3v2 tag\n");
 		old_v2size = v2_tag->paddedsize;
-	} else if (!v1_tag) {
-		PARA_NOTICE_LOG("no id3 tags found, adding id3v2 tag\n");
+	} else {
+		PARA_NOTICE_LOG("adding id3v2 tag\n");
 		v2_tag = id3_tag_new();
 		assert(v2_tag);
 	}
-	if (v2_tag) {
-		/*
-		 * Turn off all options to avoid creating an extended header.
-		 * id321 does not understand it.
-		 */
-		id3_tag_options(v2_tag, ~0U, 0);
-		ret = replace_tags(v2_tag, tags);
-		if (ret < 0)
-			goto out;
-		new_v2size = id3_tag_render(v2_tag, NULL);
-		v2_buffer = para_malloc(new_v2size);
-		id3_tag_render(v2_tag, v2_buffer);
-		PARA_INFO_LOG("writing v2 tag (%lu bytes)\n", new_v2size);
-		ret = write_all(fd, (char *)v2_buffer, new_v2size);
-		free(v2_buffer);
-		if (ret < 0)
-			goto out;
-	}
+	/*
+	 * Turn off all options to avoid creating an extended header.  id321
+	 * does not understand it.
+	 */
+	id3_tag_options(v2_tag, ~0U, 0);
+	ret = replace_tags(v2_tag, tags);
+	if (ret < 0)
+		goto out;
+	new_v2size = id3_tag_render(v2_tag, NULL);
+	v2_buffer = para_malloc(new_v2size);
+	id3_tag_render(v2_tag, v2_buffer);
+	PARA_INFO_LOG("writing v2 tag (%lu bytes)\n", new_v2size);
+	ret = write_all(fd, (char *)v2_buffer, new_v2size);
+	free(v2_buffer);
+	if (ret < 0)
+		goto out;
 	data_sz = mapsize - old_v2size;
 	if (v1_tag && data_sz >= 128)
 		data_sz -= 128;
@@ -439,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];
 }
 
@@ -659,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;
 }
@@ -685,14 +680,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;