Kill duplicate para_fread()

[paraslash.git] / mp3.c

diff --git a/mp3.c b/mp3.c
index ab8df7dfb942da7ffa1e4e87ef58e8d3c9bcc50f..bc253aa5aeaa7a787550f9619d55d2c263ce25c7 100644 (file)
--- a/mp3.c
+++ b/mp3.c
@@ -32,6 +32,7 @@
 #include "server.h"
 #include "afs.h"
 #include "error.h"
+#include "fd.h"
 
 /** \cond some defines and structs which are only used in this file */
 
@@ -108,16 +109,6 @@ static char mp3buf[8192];
 static int chunk_size;
 static struct audio_format *af;
 
-static __must_check int para_fread(void *ptr, size_t size, size_t nmemb, FILE *stream)
-{
-       size_t res = fread(ptr, size, nmemb, stream);
-       if (res == nmemb)
-               return size * nmemb;
-       if (feof(stream))
-               return 0;
-       return -E_FREAD;
-}
-
 static int header_frequency(struct mp3header *h)
 {
        if (h->version > 2 || h->freq > 3)
@@ -159,11 +150,11 @@ static void write_info_str(char *info_str)
        int v = mp3.id3_isvalid;
 
        snprintf(info_str, MMD_INFO_SIZE,
-               "audio_file_info1:%d x %lu, %lu kbit/s (%cbr) %i KHz %s\n"
+               "audio_file_info1:%d x %lums, %lu kbit/s (%cbr) %i KHz %s\n"
                "audio_file_info2:%s, by %s\n"
                "audio_file_info3:A: %s, Y: %s, C: %s\n",
                mp3.frames,
-               af->chunk_tv.tv_usec,
+               tv2ms(&af->chunk_tv),
                mp3.br_average,
                mp3.vbr? 'v' : 'c',
                mp3.freq / 1000,
@@ -410,7 +401,7 @@ static int mp3_read_info(void)
        mp3.seconds = (tv2ms(&total_time) + 500) / 1000;
        tv_divide(fcount, &total_time, &af->chunk_tv);
        rewind(mp3.file);
-       PARA_DEBUG_LOG("chunk_time: %lu\n", af->chunk_tv.tv_usec);
+       PARA_DEBUG_LOG("chunk_time: %lums\n", tv2ms(&af->chunk_tv));
        tv_scale(30, &af->chunk_tv, &af->eof_tv);
        PARA_DEBUG_LOG("eof timeout: %lu\n", tv2ms(&af->eof_tv));
        return 1;
@@ -474,7 +465,7 @@ static int mp3_read_next_chunk(void)
        return chunk_size;
 }
 
-static char *mp3_read_chunk(__unused long unsigned chunk_num, ssize_t *len)
+static char *mp3_read_chunk(__a_unused long unsigned chunk_num, ssize_t *len)
 {
        *len = mp3_read_next_chunk();
        if (*len <= 0)