X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh_common.c;h=dcb0b856677de1bded1daa0cee8e3e2002870bf5;hp=1614c27c6c9dd6d7588399ca164a9fd754087e83;hb=04c16387cc13317ded03ce478b131d94558f585f;hpb=8eb77a20423c3dcc44c4584a082e981391272cb2

diff --git a/afh_common.c b/afh_common.c
index 1614c27c..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. */
 
@@ -31,7 +27,7 @@ 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.
@@ -89,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 (;;) {
@@ -164,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)
 {
@@ -464,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 : ""
 	);
 }