X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh_common.c;h=1614c27c6c9dd6d7588399ca164a9fd754087e83;hp=6feb7c3565dc6ed1f9023ba4eb6ad6b19bcadd48;hb=173091699461dc4c08cb34bdb692cf001d8b578f;hpb=64411efdbd90f1080ad1fd010d468cea63aec923

diff --git a/afh_common.c b/afh_common.c
index 6feb7c35..1614c27c 100644
--- a/afh_common.c
+++ b/afh_common.c
@@ -16,8 +16,18 @@
 #include "afh.h"
 
 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,
+
+/*
+ * 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;
 
 /** The list of all status items */
@@ -28,7 +38,7 @@ const char *status_item_list[] = {STATUS_ITEM_ARRAY};
  *
  * We always define the full array of audio formats even if some audio formats
  * were not compiled in. This is because for each audio file the number of its
- * audio format is stored in the database. We don't want that numbers to become
+ * audio format is stored in the database. We don't want these numbers to become
  * stale just because the user installed a new version of paraslash that
  * supports a different set of audio formats.
  *
@@ -38,12 +48,12 @@ const char *status_item_list[] = {STATUS_ITEM_ARRAY};
 static struct audio_format_handler afl[] = {
 	{
 		.name = "mp3",
-		.init = mp3_init,
+		.init = mp3_afh_init,
 	},
 	{
 		.name = "ogg",
 #if defined(HAVE_OGG) && defined(HAVE_VORBIS)
-		.init = ogg_init,
+		.init = ogg_afh_init,
 #endif
 	},
 	{