X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh_common.c;h=bb04453f599e29218abb955d18fcb74a078d1eb8;hp=bec99bf4d29b6fb8b75d66e29a627eb4f5a002a3;hb=43e0a7f669d782e73513119b7140dc4e56bcc3d7;hpb=cb4dd13c2327c13d486b6abe572f4af2398b65de

diff --git a/afh_common.c b/afh_common.c
index bec99bf4..bb04453f 100644
--- a/afh_common.c
+++ b/afh_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -10,6 +10,7 @@
 #include <sys/time.h> /* gettimeofday */
 #include <sys/types.h>
 #include <dirent.h>
+#include <regex.h>
 
 #include "para.h"
 #include "error.h"
@@ -121,39 +122,6 @@ int guess_audio_format(const char *name)
 	return -E_AUDIO_FORMAT;
 }
 
-/**
- * Pretty-print the given meta-info.
- *
- * \param title The title of the audio file.
- * \param artist The artist.
- * \param album The name of the album.
- * \param year Year of release.
- * \param comment Further comments.
- *
- * This function is called by each audio format handler to produce the tag info
- * status items. Usually, the audio format handlers read this info from the
- * audio file (id3 tags, vorbis comments, ...).
- *
- * It is OK to pass \p NULL pointers for any argument in which case a suitable
- * string is inserted which indicates that this information is not available.
- *
- * \return The status item string. It must be freed by the caller.
- */
-char *make_taginfo(char *title, char *artist, char *album, char *year,
-		char *comment)
-{
-	return make_message("%s: %s, by %s\n" /* taginfo1 */
-		"%s: A: %s, Y: %s, C: %s\n", /* taginfo2 */
-		status_item_list[SI_TAGINFO1],
-		(title && *title)? title : "(title tag not set)",
-		(artist && *artist)? artist : "(artist tag not set)",
-		status_item_list[SI_TAGINFO2],
-		(album && *album)?  album : "(album tag not set)",
-		(year && *year)? year : "????",
-		(comment && *comment)? comment : "(comment tag not set)"
-	);
-}
-
 /**
  * Call get_file_info() to obtain an afhi structure.
  *
@@ -180,22 +148,52 @@ int compute_afhi(const char *path, char *data, size_t size, int fd,
 
 	afhi->header_offset = 0;
 	afhi->header_len = 0;
+	afhi->techinfo = NULL;
+	afhi->tags.artist = NULL;
+	afhi->tags.title = NULL;
+	afhi->tags.year = NULL;
+	afhi->tags.album = NULL;
+	afhi->tags.comment = NULL;
 	format = guess_audio_format(path);
 
 	if (format >= 0) {
 		ret = afl[format].get_file_info(data, size, fd, afhi);
-		if (ret >= 0)
-			return format;
+		if (ret >= 0) {
+			ret = format;
+			goto success;
+		}
 	}
 	FOR_EACH_AUDIO_FORMAT(i) {
 		if (i == format) /* we already tried this one to no avail */
 			continue;
 		ret = afl[i].get_file_info(data, size, fd, afhi);
-		if (ret >= 0)
-			return i;
+		if (ret >= 0) {
+			ret = i;
+			goto success;
+		}
 		PARA_WARNING_LOG("%s\n", para_strerror(-ret));
 	}
 	return -E_AUDIO_FORMAT;
+success:
+	if (!afhi->techinfo)
+		afhi->techinfo = para_strdup(NULL);
+	if (!afhi->tags.artist)
+		afhi->tags.artist = para_strdup(NULL);
+	if (!afhi->tags.title)
+		afhi->tags.title = para_strdup(NULL);
+	if (!afhi->tags.year)
+		afhi->tags.year = para_strdup(NULL);
+	if (!afhi->tags.album)
+		afhi->tags.album = para_strdup(NULL);
+	if (!afhi->tags.comment)
+		afhi->tags.comment = para_strdup(NULL);
+	PARA_DEBUG_LOG("techinfo: %s\n", afhi->techinfo);
+	PARA_DEBUG_LOG("artist: %s\n", afhi->tags.artist);
+	PARA_DEBUG_LOG("title: %s\n", afhi->tags.title);
+	PARA_DEBUG_LOG("year: %s\n", afhi->tags.year);
+	PARA_DEBUG_LOG("album: %s\n", afhi->tags.album);
+	PARA_DEBUG_LOG("comment: %s\n", afhi->tags.comment);
+	return ret;
 }
 
 /**
@@ -233,6 +231,15 @@ void afh_get_chunk(long unsigned chunk_num, struct afh_info *afhi,
 	*len = afhi->chunk_table[chunk_num + 1] - pos;
 }
 
+uint32_t afh_get_largest_chunk_size(struct afh_info *afhi)
+{
+	uint32_t n, largest = 0, *ct = afhi->chunk_table;
+
+	for (n = 1; n <= afhi->chunks_total; n++)
+		largest = PARA_MAX(largest, ct[n] - ct[n - 1]);
+	return largest;
+}
+
 /**
  * Get the header of an audio file.
  *
@@ -243,13 +250,14 @@ void afh_get_chunk(long unsigned chunk_num, struct afh_info *afhi,
  *
  * This function sets \a buf to \p NULL and \a len to zero if \a map or \a
  * afhi is \p NULL, or if the current audio format does not need special
- * header treamtment.
+ * header treatment.
  */
 void afh_get_header(struct afh_info *afhi, void *map, const char **buf, size_t *len)
 {
-	if (!map || !afhi || ! afhi->header_len) {
+	if (!map || !afhi || !afhi->header_len) {
 		*buf = NULL;
 		*len = 0;
+		return;
 	}
 	*len = afhi->header_len;
 	*buf = map + afhi->header_offset;