X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=mp3.c;h=b9b21a94de7db52f680bb90e788778fa8e74d1e6;hb=db34194eaab9819772bd55ea1ab08c719ed8f1c8;hp=ab05d2e7d62989e61305700cbccf997d2b3641ff;hpb=586cea4b850e53eedf7426379f6af6a7e76dee6e;p=paraslash.git diff --git a/mp3.c b/mp3.c index ab05d2e7..b9b21a94 100644 --- 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 */ @@ -106,17 +107,7 @@ static const char *mode_text[] = {"stereo", "joint stereo", "dual channel", "mon static struct mp3info mp3; 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 struct audio_format_handler *af; static int header_frequency(struct mp3header *h) {