X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh_common.c;h=bab4d41577952f257ef8c828f9c89c8886a7d2e5;hp=78e3779cb9e875c7bbbbe3dfa4313164610c6354;hb=4643fd6eeee81acc0e82e47e7895a3111775bbba;hpb=6a0cd05bad7cb1fb166c54aaa8f04927e40baa68

diff --git a/afh_common.c b/afh_common.c
index 78e3779c..bab4d415 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,19 +12,29 @@
 #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 */
-const char *status_item_list[] = {STATUS_ITEM_ARRAY};
+const char *status_item_list[] = {STATUS_ITEMS};
 
 /**
  * The list of supported audio formats.
  *
  * 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,17 +44,17 @@ 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
 	},
 	{
 		.name = "aac",
-#if defined(HAVE_MP4V2)
+#if defined(HAVE_FAAD)
 		.init = aac_afh_init,
 #endif
 	},
@@ -88,7 +94,6 @@ static inline int next_audio_format(int format)
 		if (afl[format].init)
 			return format;
 	}
-
 }
 
 /** Iterate over each supported audio format. */
@@ -455,21 +460,21 @@ unsigned afh_get_afhi_txt(int audio_format_num, struct afh_info *afhi, char **re
 		"%s: %s\n" /* year */
 		"%s: %s\n" /* album */
 		"%s: %s\n", /* comment */
-		status_item_list[SI_BITRATE], afhi->bitrate,
-		status_item_list[SI_FORMAT], audio_format_name(audio_format_num),
-		status_item_list[SI_FREQUENCY], afhi->frequency,
-		status_item_list[SI_CHANNELS], afhi->channels,
-		status_item_list[SI_SECONDS_TOTAL], afhi->seconds_total,
-		status_item_list[SI_CHUNK_TIME], (long unsigned)afhi->chunk_tv.tv_sec,
+		status_item_list[SI_bitrate], afhi->bitrate,
+		status_item_list[SI_format], audio_format_name(audio_format_num),
+		status_item_list[SI_frequency], afhi->frequency,
+		status_item_list[SI_channels], afhi->channels,
+		status_item_list[SI_seconds_total], afhi->seconds_total,
+		status_item_list[SI_chunk_time], (long unsigned)afhi->chunk_tv.tv_sec,
 			(long unsigned)afhi->chunk_tv.tv_usec,
-		status_item_list[SI_NUM_CHUNKS], afhi->chunks_total,
-		status_item_list[SI_MAX_CHUNK_SIZE], afhi->max_chunk_size,
-		status_item_list[SI_TECHINFO], afhi->techinfo? afhi->techinfo : "",
-		status_item_list[SI_ARTIST], afhi->tags.artist? afhi->tags.artist : "",
-		status_item_list[SI_TITLE], afhi->tags.title? afhi->tags.title : "",
-		status_item_list[SI_YEAR], afhi->tags.year? afhi->tags.year : "",
-		status_item_list[SI_ALBUM], afhi->tags.album? afhi->tags.album : "",
-		status_item_list[SI_COMMENT], afhi->tags.comment? afhi->tags.comment : ""
+		status_item_list[SI_num_chunks], afhi->chunks_total,
+		status_item_list[SI_max_chunk_size], afhi->max_chunk_size,
+		status_item_list[SI_techinfo], afhi->techinfo? afhi->techinfo : "",
+		status_item_list[SI_artist], afhi->tags.artist? afhi->tags.artist : "",
+		status_item_list[SI_title], afhi->tags.title? afhi->tags.title : "",
+		status_item_list[SI_year], afhi->tags.year? afhi->tags.year : "",
+		status_item_list[SI_album], afhi->tags.album? afhi->tags.album : "",
+		status_item_list[SI_comment], afhi->tags.comment? afhi->tags.comment : ""
 	);
 }