X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh.c;h=894cd78284d36c9de7ef1aa565894e6dd6017384;hp=fad93c49cdca17f54558c2c6cdc25646773bea11;hb=a601afd9c3c5819a0f2361bf073b7c737dcdab45;hpb=002731cd3938f3be6b71651e56c062af1adcdec0;ds=sidebyside

diff --git a/afh.c b/afh.c
index fad93c49..894cd782 100644
--- a/afh.c
+++ b/afh.c
@@ -32,18 +32,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,6 +176,13 @@ 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");
 		}
 		ret2 = para_munmap(audio_file_data, audio_file_size);