Rename audio_info status items and get rid of duplicate afh info.

[paraslash.git] / ogg_afh.c

diff --git a/ogg_afh.c b/ogg_afh.c
index 5611579abd552df3b6074a2cf4d65abb1b3abab1..f223b57f5fe6be547caf0dc8d01eb4ed26a90bcb 100644 (file)
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -267,13 +267,12 @@ 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_TAG_INFO1],
+               status_item_list[SI_TAG_INFO2]
+       );
        afhi->chunk_tv.tv_sec = 0;
        afhi->chunk_tv.tv_usec = 250 * 1000;
        tv_scale(3, &afhi->chunk_tv, &afhi->eof_tv);