X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh_common.c;h=dfbf75132f4e4372eb0b4c95bff8ef25793dc545;hp=0e9b13ca24cd0138a195c27633e37f16ca944ec2;hb=1709cc8f8a54429441f8f83c38146e667133c727;hpb=4d9d588c5df359c3c5f279fbfd4ea51d3a2afc87

diff --git a/afh_common.c b/afh_common.c
index 0e9b13ca..dfbf7513 100644
--- a/afh_common.c
+++ b/afh_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2014 Andre Noll <maan@tuebingen.mpg.de>
+ * Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -15,27 +15,10 @@
 #include "string.h"
 #include "afh.h"
 
-/* The mp3 audio format handler does not need any libs. */
-void mp3_init(struct audio_format_handler *);
-
-#ifdef HAVE_OGGVORBIS
-	void ogg_init(struct audio_format_handler *);
-#endif
-#ifdef HAVE_FAAD
-	void aac_afh_init(struct audio_format_handler *);
-#endif
-#ifdef HAVE_SPEEX
-	void spx_afh_init(struct audio_format_handler *);
-#endif
-#ifdef HAVE_FLAC
-	void flac_afh_init(struct audio_format_handler *);
-#endif
-
-#ifdef HAVE_OPUS
-	void opus_afh_init(struct audio_format_handler *);
-#endif
-
-void wma_afh_init(struct audio_format_handler *);
+typedef void afh_init_func(struct audio_format_handler *);
+/* It does not hurt to declare init functions which are not available. */
+extern afh_init_func mp3_init, ogg_init, aac_afh_init, wma_afh_init,
+	spx_afh_init, flac_afh_init, opus_afh_init;
 
 /** The list of all status items */
 const char *status_item_list[] = {STATUS_ITEM_ARRAY};
@@ -59,13 +42,13 @@ static struct audio_format_handler afl[] = {
 	},
 	{
 		.name = "ogg",
-#ifdef HAVE_OGGVORBIS
+#if defined(HAVE_OGG) && defined(HAVE_VORBIS)
 		.init = ogg_init,
 #endif
 	},
 	{
 		.name = "aac",
-#ifdef HAVE_FAAD
+#if defined(HAVE_MP4V2)
 		.init = aac_afh_init,
 #endif
 	},
@@ -75,19 +58,19 @@ static struct audio_format_handler afl[] = {
 	},
 	{
 		.name = "spx",
-#ifdef HAVE_SPEEX
+#if defined(HAVE_OGG) && defined(HAVE_SPEEX)
 		.init = spx_afh_init,
 #endif
 	},
 	{
 		.name = "flac",
-#ifdef HAVE_FLAC
+#if defined(HAVE_OGG) && defined(HAVE_FLAC)
 		.init = flac_afh_init,
 #endif
 	},
 	{
 		.name = "opus",
-#ifdef HAVE_OPUS
+#if defined(HAVE_OGG) && defined(HAVE_OPUS)
 		.init = opus_afh_init,
 #endif
 	},
@@ -118,9 +101,9 @@ void afh_init(void)
 {
 	int i;
 
-	PARA_INFO_LOG("supported audio formats: %s\n", AUDIO_FORMAT_HANDLERS);
+	PARA_NOTICE_LOG("supported audio formats: %s\n", AUDIO_FORMAT_HANDLERS);
 	FOR_EACH_AUDIO_FORMAT(i) {
-		PARA_NOTICE_LOG("initializing %s handler\n",
+		PARA_INFO_LOG("initializing %s handler\n",
 			audio_format_name(i));
 		afl[i].init(&afl[i]);
 	}
@@ -156,6 +139,38 @@ int guess_audio_format(const char *name)
 	return -E_AUDIO_FORMAT;
 }
 
+/**
+ * Get the name of the given audio format.
+ *
+ * \param i The audio format number.
+ *
+ * \return This returns a pointer to statically allocated memory so it
+ * must not be freed by the caller.
+ */
+const char *audio_format_name(int i)
+{
+	if (i < 0 || i >= ARRAY_SIZE(afl) - 1)
+		return "???";
+	return afl[i].name;
+}
+
+static int get_file_info(int format, const char *path, char *data,
+		size_t size, int fd, struct afh_info *afhi)
+{
+	int ret;
+	const char *fmt = audio_format_name(format);
+
+	memset(afhi, 0, sizeof(*afhi));
+	ret = afl[format].get_file_info(data, size, fd, afhi);
+	if (ret < 0) {
+		PARA_WARNING_LOG("%s: %s format not detected: %s\n",
+			path, fmt, para_strerror(-ret));
+		return ret;
+	}
+	PARA_NOTICE_LOG("%s: detected %s format\n", path, fmt);
+	return format;
+}
+
 /**
  * Call get_file_info() to obtain an afhi structure.
  *
@@ -180,31 +195,18 @@ int compute_afhi(const char *path, char *data, size_t size, int fd,
 {
 	int ret, i, format;
 
-	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) {
-			ret = format;
+		ret = get_file_info(format, path, data, size, fd, afhi);
+		if (ret >= 0)
 			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) {
-			ret = i;
+		ret = get_file_info(i, path, data, size, fd, afhi);
+		if (ret >= 0)
 			goto success;
-		}
-		PARA_WARNING_LOG("%s\n", para_strerror(-ret));
 	}
 	return -E_AUDIO_FORMAT;
 success:
@@ -250,21 +252,6 @@ void clear_afhi(struct afh_info *afhi)
 	free(afhi->tags.comment);
 }
 
-/**
- * Get the name of the given audio format.
- *
- * \param i The audio format number.
- *
- * \return This returns a pointer to statically allocated memory so it
- * must not be freed by the caller.
- */
-const char *audio_format_name(int i)
-{
-	if (i < 0 || i >= ARRAY_SIZE(afl) - 1)
-		return "???";
-	return afl[i].name;
-}
-
 static inline size_t get_chunk_len(long unsigned chunk_num,
 		const struct afh_info *afhi)
 {
@@ -308,8 +295,8 @@ int32_t afh_get_start_chunk(int32_t approx_chunk_num,
 
 	for (k = PARA_MAX(0, approx_chunk_num); k >= 0; k--)
 		if (get_chunk_len(k, afhi) > 0)
-			break;
-	return k;
+			return k;
+	return 0;
 }
 
 /**
@@ -384,9 +371,9 @@ unsigned afh_get_afhi_txt(int audio_format_num, struct afh_info *afhi, char **re
 		"%s: %s\n" /* format */
 		"%s: %dHz\n" /* frequency */
 		"%s: %d\n" /* channels */
-		"%s: %lu\n" /* seconds total */
+		"%s: %" PRIu32 "\n" /* seconds total */
 		"%s: %lu: %lu\n" /* chunk time */
-		"%s: %lu\n" /* num chunks */
+		"%s: %" PRIu32 "\n" /* num chunks */
 		"%s: %s\n" /* techinfo */
 		"%s: %s\n" /* artist */
 		"%s: %s\n" /* title */
@@ -409,3 +396,31 @@ unsigned afh_get_afhi_txt(int audio_format_num, struct afh_info *afhi, char **re
 		status_item_list[SI_COMMENT], afhi->tags.comment? afhi->tags.comment : ""
 	);
 }
+
+/**
+ * Create a copy of the given file with altered meta tags.
+ *
+ * \param audio_format_id Specifies the audio format.
+ * \param map The (read-only) memory map of the input file.
+ * \param mapsize The size of the input file in bytes.
+ * \param tags The new tags.
+ * \param output_fd Altered file is created using this file descriptor.
+ * \param filename The name of the temporary output file.
+ *
+ * This calls the ->rewrite_tags method of the audio format handler associated
+ * with \a audio_format_id to create a copy of the memory-mapped file given
+ * by \a map and \a mapsize, but with altered tags according to \a tags. If
+ * the audio format handler for \a audio_format_id lacks this optional method,
+ * the function returns (the paraslash error code of) \p ENOTSUP.
+ *
+ * \return Standard.
+ */
+int afh_rewrite_tags(int audio_format_id, void *map, size_t mapsize,
+		struct taginfo *tags, int output_fd, const char *filename)
+{
+	struct audio_format_handler *afh = afl + audio_format_id;
+
+	if (!afh->rewrite_tags)
+		return -ERRNO_TO_PARA_ERROR(ENOTSUP);
+	return afh->rewrite_tags(map, mapsize, tags, output_fd, filename);
+}