X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=afh.c;h=ee55cf0e603d1ff0cfa8b4f1bf55eeb8aba10098;hb=b84e3757cf3d98fc02f407963a523bbda477aebe;hp=bffe63216e71627dde4b4b49b53c436388500444;hpb=0703f75a276020f9645f987134d49402f7c019c0;p=paraslash.git

diff --git a/afh.c b/afh.c
index bffe6321..ee55cf0e 100644
--- a/afh.c
+++ b/afh.c
@@ -18,9 +18,6 @@
 #include "version.h"
 
 static struct afh_args_info conf;
-/** The list of all status items */
-const char *status_item_list[] = {STATUS_ITEM_ARRAY};
-
 INIT_AFH_ERRLISTS;
 
 static int loglevel;
@@ -28,34 +25,11 @@ INIT_STDERR_LOGGING(loglevel)
 
 static void print_info(int audio_format_num, struct afh_info *afhi)
 {
-	printf("%s: %dkbit/s\n" /* bitrate */
-		"%s: %s\n" /* format */
-		"%s: %dHz\n" /* frequency */
-		"%s: %d\n" /* channels */
-		"%s: %lu\n" /* seconds total */
-		"%s: %lu: %lu\n" /* chunk time */
-		"%s: %lu\n" /* num chunks */
-		"%s: %s\n" /* techinfo */
-		"%s: %s\n" /* artist */
-		"%s: %s\n" /* title */
-		"%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,
-			(long unsigned)afhi->chunk_tv.tv_usec,
-		status_item_list[SI_NUM_CHUNKS], afhi->chunks_total,
-		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 : ""
-	);
+	char *msg;
+
+	afh_get_afhi_txt(audio_format_num, afhi, &msg);
+	printf("%s", msg);
+	free(msg);
 }
 
 static void print_chunk_table(struct afh_info *afhi)
@@ -207,13 +181,7 @@ int main(int argc, char **argv)
 				print_chunk_table(&afhi);
 			printf("\n");
 		}
-		free(afhi.techinfo);
-		free(afhi.tags.artist);
-		free(afhi.tags.title);
-		free(afhi.tags.year);
-		free(afhi.tags.album);
-		free(afhi.tags.comment);
-		free(afhi.chunk_table);
+		clear_afhi(&afhi);
 		ret2 = para_munmap(audio_file_data, audio_file_size);
 		if (ret2 < 0 && ret >= 0)
 			ret = ret2;