X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3_afh.c;h=728b25b81f94aa177a1e74ae01fca07419f7fe90;hp=f279cd5752ad8be4798ff5c0fc3fecd9c212b67a;hb=HEAD;hpb=fb3fd5b4ddaf52e19303126ea1bacacc5954d808

diff --git a/mp3_afh.c b/mp3_afh.c
index f279cd57..56f28a09 100644
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -37,9 +37,6 @@ struct mp3header {
 	unsigned int freq;
 	unsigned int padding;
 	unsigned int mode;
-	unsigned int copyright;
-	unsigned int original;
-	unsigned int emphasis;
 };
 
 static const int frequencies[3][4] = {
@@ -348,7 +345,7 @@ static int mp3_rewrite_tags(const char *map, size_t mapsize,
 	if (ret < 0)
 		goto out;
 	new_v2size = id3_tag_render(v2_tag, NULL);
-	v2_buffer = para_malloc(new_v2size);
+	v2_buffer = alloc(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);
@@ -473,7 +470,7 @@ static int frame_length(struct mp3header *header)
 		+ header->padding;
 }
 
-static int compare_headers(struct mp3header *h1,struct mp3header *h2)
+static int compare_headers(struct mp3header *h1, struct mp3header *h2)
 {
 	if ((*(unsigned int*)h1) == (*(unsigned int*)h2))
 		return 1;
@@ -481,10 +478,7 @@ static int compare_headers(struct mp3header *h1,struct mp3header *h2)
 			(h1->layer == h2->layer) &&
 			(h1->crc == h2->crc) &&
 			(h1->freq == h2->freq) &&
-			(h1->mode == h2->mode) &&
-			(h1->copyright == h2->copyright) &&
-			(h1->original == h2->original) &&
-			(h1->emphasis == h2->emphasis))
+			(h1->mode == h2->mode))
 		return 1;
 	return 0;
 }
@@ -598,7 +592,7 @@ static int mp3_read_info(unsigned char *map, size_t numbytes, int fd,
 	const char *tag_versions[] = {"no", "id3v1", "id3v2", "id3v1+id3v2"};
 
 	afhi->chunks_total = 0;
-	afhi->chunk_table = para_malloc(chunk_table_size * sizeof(uint32_t));
+	afhi->chunk_table = arr_alloc(chunk_table_size, sizeof(uint32_t));
 	while (1) {
 		int freq, br;
 		struct timeval tmp, cct; /* current chunk time */
@@ -633,8 +627,8 @@ static int mp3_read_info(unsigned char *map, size_t numbytes, int fd,
 		total_time = tmp;
 		if (afhi->chunks_total >= chunk_table_size) {
 			chunk_table_size *= 2;
-			afhi->chunk_table = para_realloc(afhi->chunk_table,
-				chunk_table_size * sizeof(uint32_t));
+			afhi->chunk_table = arr_realloc(afhi->chunk_table,
+				chunk_table_size, sizeof(uint32_t));
 		}
 		afhi->chunk_table[afhi->chunks_total] = fpos;
 		afhi->chunks_total++;
@@ -675,7 +669,7 @@ static int mp3_get_file_info(char *map, size_t numbytes, int fd,
 	ret = mp3_read_info((unsigned char *)map, numbytes, fd, afhi);
 	if (ret < 0)
 		return ret;
-	if (afhi->seconds_total < 2 || !afhi->chunks_total)
+	if (afhi->chunks_total == 0)
 		return -E_MP3_INFO;
 	return 1;
 }