X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh.c;h=c00644939d1bdd04f5010729715af874725f4a86;hp=8e1e6b31960a6f3fd7da8d8f7b7cf9b0cf73475c;hb=df6606e438a34c7bfc325e5f320843d1e97d3f7a;hpb=3b9f8feb481d0532da2ec041a4ddc2e2f1b60649

diff --git a/afh.c b/afh.c
index 8e1e6b31..c0064493 100644
--- a/afh.c
+++ b/afh.c
@@ -6,6 +6,7 @@
 
 /** \file afh.c Paraslash's standalone audio format handler tool. */
 
+#include <regex.h>
 #include <dirent.h>
 #include <sys/time.h>
 
@@ -32,18 +33,28 @@ static void print_info(int audio_format_num, struct afh_info *afhi)
 		"%s: %dHz\n" /* frequency */
 		"%s: %d\n" /* channels */
 		"%s: %lu\n" /* seconds total */
-		"%s" /* tag info */
 		"%s: %lu: %lu\n" /* chunk time */
-		"%s: %lu\n", /* num chunks */
+		"%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,
-		afhi->info_string,
 		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_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 : ""
 	);
 }
 
@@ -166,10 +177,15 @@ int main(int argc, char **argv)
 			print_info(audio_format_num, &afhi);
 			if (conf.chunk_table_given)
 				print_chunk_table(&afhi);
+			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);
 			printf("\n");
 		}
-		free(afhi.chunk_table);
-		free(afhi.info_string);
 		ret2 = para_munmap(audio_file_data, audio_file_size);
 		if (ret2 < 0 && ret >= 0)
 			ret = ret2;