Keep the audio file open when mmapping.

[paraslash.git] / ogg_afh.c

diff --git a/ogg_afh.c b/ogg_afh.c
index 5611579abd552df3b6074a2cf4d65abb1b3abab1..2b934ddd1de9438039cee7990101ad6064e8e5b0 100644 (file)
--- 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,16 +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);
-       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 = make_message("%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 */