X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ogg_afh.c;h=0ea3569a5b3e689ba1f257b09f73b3eacf943ff3;hp=5611579abd552df3b6074a2cf4d65abb1b3abab1;hb=80e46ec589d14be2fa4b0704f613a04ecb1b64c4;hpb=732db80493440d188963cea27d822447925ab5ad

diff --git a/ogg_afh.c b/ogg_afh.c
index 5611579a..0ea3569a 100644
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2004-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -267,16 +267,15 @@ static int ogg_get_file_info(char *map, size_t numbytes,
 	afhi->bitrate = ov_bitrate(&of, 0) / 1000;
 	afhi->channels = vi->channels;
 	afhi->chunks_total = ogg_compute_chunk_table(&of, afhi, afhi->seconds_total);
-	sprintf(afhi->info_string, "audio_file_info1:%lu x %lu, %ukHz, "
-		"%d channels, %ukbps\n"
-		"audio_file_info2: \n"
-		"audio_file_info3: \n",
-		afhi->chunks_total, (long unsigned) (chunk_time * 1000 * 1000),
-		afhi->frequency / 1000, vi->channels, afhi->bitrate
-		);
+	afhi->info_string[0] = '\0';
+	sprintf(afhi->info_string, "%s:\n%s:\n%s:\n",
+		status_item_list[SI_AUDIO_FILE_INFO],
+		status_item_list[SI_TAGINFO1],
+		status_item_list[SI_TAGINFO2]
+	);
 	afhi->chunk_tv.tv_sec = 0;
 	afhi->chunk_tv.tv_usec = 250 * 1000;
-	tv_scale(3, &afhi->chunk_tv, &afhi->eof_tv);
+	tv_scale(10 / afhi->channels, &afhi->chunk_tv, &afhi->eof_tv);
 	ret = 1;
 err:
 	ov_clear(&of); /* keeps the file open */