X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3_afh.c;h=d0be0ad95459390e37879870b349e88783618509;hp=2d18d5e5de7df641f6cbe7b7ad937cb3f2d69e3e;hb=3010ef96e10cb15d423eef8f9802fbed78744393;hpb=813bec7dd99c3f5f43f046af0b1c87d70010dd19

diff --git a/mp3_afh.c b/mp3_afh.c
index 2d18d5e5..d0be0ad9 100644
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -16,12 +16,12 @@
  *			 Johannes Overmann <overmann@iname.com>
  */
 
+#include <regex.h>
+
 #include "para.h"
 #include "error.h"
 #include "afh.h"
 #include "string.h"
-#include "afs.h"
-#include "server.h"
 
 /** \cond some defines and structs which are only used in this file */
 
@@ -126,62 +126,49 @@ static char *get_strings(struct id3_frame *fr)
 	return NULL;
 }
 
-static char *mp3_get_id3(__a_unused unsigned char *map,
-		__a_unused size_t numbytes, int fd)
+static void mp3_get_id3(__a_unused unsigned char *map,
+		__a_unused size_t numbytes, int fd, struct taginfo *tags)
 {
 	int i;
 	struct id3_tag *id3_t;
-	char *title = NULL, *artist = NULL, *album = NULL, *year = NULL,
-		*comment = NULL, *result;
 	struct id3_file *id3_f = id3_file_fdopen(fd, ID3_FILE_MODE_READONLY);
 
 	if (!id3_f)
-		goto no_tag;
+		return;
 	id3_t = id3_file_tag(id3_f);
-	if (!id3_t)
-		goto no_tag;
+	if (!id3_t) {
+		id3_file_close(id3_f);
+		return;
+	}
 	for (i = 0; i < id3_t->nframes; i++) {
 		struct id3_frame *fr = id3_t->frames[i];
 		if (!strcmp(fr->id, "TIT2")) {
-			if (!title)
-				title = get_strings(fr);
+			if (!tags->title)
+				tags->title = get_strings(fr);
 			continue;
 		}
 		if (!strcmp(fr->id, "TPE1")) {
-			if (!artist)
-				artist = get_strings(fr);
+			if (!tags->artist)
+				tags->artist = get_strings(fr);
 			continue;
 		}
 		if (!strcmp(fr->id, "TALB")) {
-			if (!album)
-				album = get_strings(fr);
+			if (!tags->album)
+				tags->album = get_strings(fr);
 			continue;
 		}
 		if (!strcmp(fr->id, "TDRC")) {
-			if (!year)
-				year = get_strings(fr);
+			if (!tags->year)
+				tags->year = get_strings(fr);
 			continue;
 		}
 		if (!strcmp(fr->id, "COMM")) {
-			if (!comment)
-				comment = get_strings(fr);
+			if (!tags->comment)
+				tags->comment = get_strings(fr);
 			continue;
 		}
 	}
 	id3_file_close(id3_f);
-	result = make_taginfo(title, artist, album, year, comment);
-	free(title);
-	free(artist);
-	free(album);
-	free(year);
-	free(comment);
-	return result;
-no_tag:
-	if (id3_f)
-		id3_file_close(id3_f);
-	return make_message("%s: (no id3 v1/v2 tag)\n%s:\n",
-		status_item_list[SI_TAGINFO1],
-		status_item_list[SI_TAGINFO2]);
 }
 
 #else /* HAVE_LIBID3TAG */
@@ -197,16 +184,15 @@ static char *unpad(char *string)
 	return string;
 }
 
-static char *mp3_get_id3(unsigned char *map, size_t numbytes, __a_unused int fd)
+static void mp3_get_id3(unsigned char *map, size_t numbytes, __a_unused int fd,
+	struct taginfo *tags)
 {
 	char title[31], artist[31], album[31], year[5], comment[31];
 	off_t fpos;
 
 	if (numbytes < 128 || strncmp("TAG", (char *)map + numbytes - 128, 3)) {
 		PARA_DEBUG_LOG("no id3 v1 tag\n");
-		return make_message("%s: (no id3 v1 tag)\n%s:\n",
-			status_item_list[SI_TAGINFO1],
-			status_item_list[SI_TAGINFO2]);
+		return;
 	}
 	fpos = numbytes - 125;
 	memcpy(title, map + fpos, 30);
@@ -228,7 +214,11 @@ static char *mp3_get_id3(unsigned char *map, size_t numbytes, __a_unused int fd)
 	unpad(album);
 	unpad(year);
 	unpad(comment);
-	return make_taginfo(title, artist, album, year, comment);
+	tags->artist = para_strdup(artist);
+	tags->title = para_strdup(title);
+	tags->year = para_strdup(year);
+	tags->album = para_strdup(album);
+	tags->comment = para_strdup(comment);
 }
 #endif /* HAVE_LIBID3TAG */
 
@@ -400,11 +390,9 @@ static int mp3_read_info(unsigned char *map, size_t numbytes, int fd,
 	unsigned chunk_table_size = 1000; /* gets increased on demand */
 	off_t fpos = 0;
 	struct mp3header header;
-	char *taginfo;
 
 	afhi->chunks_total = 0;
 	afhi->chunk_table = para_malloc(chunk_table_size * sizeof(uint32_t));
-	taginfo = mp3_get_id3(map, numbytes, fd);
 	while (1) {
 		int freq, br;
 		struct timeval tmp, cct; /* current chunk time */
@@ -460,15 +448,11 @@ 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("%lu chunks, each %lums\n", afhi->chunks_total,
 		tv2ms(&afhi->chunk_tv));
-	tv_scale(3, &afhi->chunk_tv, &afhi->eof_tv);
-	PARA_DEBUG_LOG("eof timeout: %lu\n", tv2ms(&afhi->eof_tv));
-	afhi->info_string = make_message("%s: %cbr, %s\n%s",
-		status_item_list[SI_AUDIO_FILE_INFO], vbr? 'v' : 'c',
-		header_mode(&header), taginfo);
-	free(taginfo);
+	afhi->techinfo = make_message("%cbr, %s", vbr? 'v' : 'c',
+		header_mode(&header));
+	mp3_get_id3(map, numbytes, fd, &afhi->tags);
 	return 1;
 err_out:
-	free(taginfo);
 	PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	free(afhi->chunk_table);
 	return ret;