X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=ogg_afh.c;h=2b934ddd1de9438039cee7990101ad6064e8e5b0;hb=8231c4db98e5278fde9678a5d16a68fbef777662;hp=f223b57f5fe6be547caf0dc8d01eb4ed26a90bcb;hpb=9207a81bf1bb5b6bd4db7e2640994e0cfc5f9a3f;p=paraslash.git

diff --git a/ogg_afh.c b/ogg_afh.c
index f223b57f..2b934ddd 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.
  */
@@ -238,7 +238,7 @@ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of,
 /*
  * Init oggvorbis file and write some tech data to given pointers.
  */
-static int ogg_get_file_info(char *map, size_t numbytes,
+static int ogg_get_file_info(char *map, size_t numbytes, __a_unused int fd,
 		struct afh_info *afhi)
 {
 	int ret;
@@ -267,15 +267,14 @@ 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);
-	afhi->info_string[0] = '\0';
-	sprintf(afhi->info_string, "%s:\n%s:\n%s:\n",
+	afhi->info_string = make_message("%s:\n%s:\n%s:\n",
 		status_item_list[SI_AUDIO_FILE_INFO],
-		status_item_list[SI_TAG_INFO1],
-		status_item_list[SI_TAG_INFO2]
+		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 */