Merge branch 'refs/heads/t/doxygen'

[paraslash.git] / afh_common.c

diff --git a/afh_common.c b/afh_common.c
index 0d8d905c4a9c764097fa6e7acf6023c50454f958..1614c27c6c9dd6d7588399ca164a9fd754087e83 100644 (file)
--- a/afh_common.c
+++ b/afh_common.c
@@ -16,6 +16,7 @@
 #include "afh.h"
 
 typedef void afh_init_func(struct audio_format_handler *);
+
 /*
  * Declaration of the audio format handler init functions.
  *
@@ -26,7 +27,7 @@ typedef void afh_init_func(struct audio_format_handler *);
  * 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_init, ogg_init, aac_afh_init, wma_afh_init,
+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 */
@@ -37,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.
  *
@@ -47,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
        },
        {