X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh.c;h=b5fb65fc418a6e4a3febef87cdce6d630b81cfb3;hp=c00644939d1bdd04f5010729715af874725f4a86;hb=fa578bf1d070161cafcbcc69ca7b810414ee1a4b;hpb=a4eb244ecdf9aaa0f167b3c91d3e276bde99d681

diff --git a/afh.c b/afh.c
index c0064493..b5fb65fc 100644
--- a/afh.c
+++ b/afh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2008-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -62,10 +62,25 @@ static void print_chunk_table(struct afh_info *afhi)
 {
 	int i;
 
-	printf("chunk_table: ");
-	for (i = 0; i <= afhi->chunks_total; i++)
-		printf("%u ", afhi->chunk_table[i]);
-	printf("\n");
+	if (!conf.human_given) {
+		printf("chunk_table: ");
+		for (i = 0; i <= afhi->chunks_total; i++)
+			printf("%u ", afhi->chunk_table[i]);
+		printf("\n");
+		return;
+	}
+	for (i = 1; i <= afhi->chunks_total; i++) {
+		struct timeval tv;
+		long unsigned from, to;
+		tv_scale(i - 1, &afhi->chunk_tv, &tv);
+		from = tv2ms(&tv);
+		tv_scale(i, &afhi->chunk_tv, &tv);
+		to = tv2ms(&tv);
+		printf("%d [%lu.%03lu - %lu.%03lu] %u - %u (%u)\n", i - 1,
+			from / 1000, from % 1000, to / 1000, to % 1000,
+			afhi->chunk_table[i - 1], afhi->chunk_table[i],
+			afhi->chunk_table[i] - afhi->chunk_table[i - 1]);
+	}
 }
 
 static int cat_file(void *audio_file_data, struct afh_info *afhi)
@@ -177,15 +192,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.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);
 		ret2 = para_munmap(audio_file_data, audio_file_size);
 		if (ret2 < 0 && ret >= 0)
 			ret = ret2;