Switch to the new afs.

[paraslash.git] / ogg_afh.c

diff --git a/ogg_afh.c b/ogg_afh.c
index 2b4c100a9f32c7f1091b568680aee97598a6d7e0..39859c08ebba613885f424f7c941d79dfa7f2f99 100644 (file)
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -12,9 +12,10 @@
 
 #include "para.h"
 #include "afh.h"
-#include "server.h"
 #include "error.h"
 #include "string.h"
+#include "afs.h"
+#include "server.h"
 
 /** must be big enough to hold header */
 #define CHUNK_SIZE 32768
@@ -263,7 +264,7 @@ static int ogg_get_file_info(char *map, size_t numbytes,
                goto err;
        afi->seconds_total = ov_time_total(&of, -1);
        afi->frequency = vi->rate;
-       afi->bitrate = ov_bitrate(&of, 0);
+       afi->bitrate = ov_bitrate(&of, 0) / 1000;
        afi->channels = vi->channels;
        afi->chunks_total = ogg_compute_chunk_table(&of, afi, afi->seconds_total);
        sprintf(afi->info_string, "audio_file_info1:%lu x %lu, %ukHz, "
@@ -271,7 +272,7 @@ static int ogg_get_file_info(char *map, size_t numbytes,
                "audio_file_info2: \n"
                "audio_file_info3: \n",
                afi->chunks_total, (long unsigned) (chunk_time * 1000 * 1000),
-               afi->frequency / 1000, vi->channels, afi->bitrate / 1000
+               afi->frequency / 1000, vi->channels, afi->bitrate
                );
        afi->chunk_tv.tv_sec = 0;
        afi->chunk_tv.tv_usec = 250 * 1000;