X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh_common.c;h=063ae8f0b104ccab15e9f10f637ec34e7783e785;hp=edfc8d1d08e79f333afce711aa814a374c8f1faf;hb=5e8d8a8eea6de9459ebdf4498f9f061c84bfa63a;hpb=68630d8b55d688a7c7ce116951c310150aa9c166

diff --git a/afh_common.c b/afh_common.c
index edfc8d1d..063ae8f0 100644
--- a/afh_common.c
+++ b/afh_common.c
@@ -42,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
 	},
@@ -58,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
 	},
@@ -367,9 +367,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 */
@@ -392,3 +392,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);
+}