X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=afh_common.c;h=dcb0b856677de1bded1daa0cee8e3e2002870bf5;hb=04c16387cc13317ded03ce478b131d94558f585f;hp=516ea6546ee09689adf3939fd2e8a976d33881da;hpb=13ba5f96e64bd0f3157a6fe73ed7b950ec9c5ea7;p=paraslash.git

diff --git a/afh_common.c b/afh_common.c
index 516ea654..dcb0b856 100644
--- a/afh_common.c
+++ b/afh_common.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file afh_common.c Common audio format handler functions. */
 
@@ -16,7 +12,17 @@
 #include "afh.h"
 
 typedef void afh_init_func(struct audio_format_handler *);
-/* It does not hurt to declare init functions which are not available. */
+
+/*
+ * Declaration of the audio format handler init functions.
+ *
+ * These symbols are referenced in the afl array below.
+ *
+ * Most audio format handlers depend on an external library and are not
+ * compiled in if the library is not installed. Hence it is well possible that
+ * not all of these functions are defined. It does not hurt to declare them
+ * anyway, and this avoids another set of ifdefs.
+ */
 extern afh_init_func mp3_afh_init, ogg_afh_init, aac_afh_init, wma_afh_init,
 	spx_afh_init, flac_afh_init, opus_afh_init;
 
@@ -79,6 +85,21 @@ static struct audio_format_handler afl[] = {
 	}
 };
 
+/**
+ * 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 int next_audio_format(int format)
 {
 	for (;;) {
@@ -154,21 +175,6 @@ 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)
 {