X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=mp3_afh.c;h=a63e2e861b27e0f5ae0582037dcc862e804ca0f0;hb=c39956768e5a7e4bc8c0124b216afbdadf3c0262;hp=4bd8888767406187d51f2f40f87cd8cc25d8c345;hpb=90501714a4379e36e191a7d5330378f898ac258f;p=paraslash.git diff --git a/mp3_afh.c b/mp3_afh.c index 4bd88887..a63e2e86 100644 --- a/mp3_afh.c +++ b/mp3_afh.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2006 Andre Noll + * Copyright (C) 2003-2007 Andre Noll * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ -/** \file mp3.c para_server's mp3 audio format handler */ +/** \file mp3_afh.c para_server's mp3 audio format handler */ /* * This file is based in part on mp3tech.c and mp3tech.h, Copyright (C) @@ -30,7 +30,7 @@ #include "server.cmdline.h" #include "server.h" -#include "afs.h" +#include "vss.h" #include "afh.h" #include "error.h" #include "fd.h" @@ -403,7 +403,7 @@ static int mp3_read_info(void) tv_divide(fcount, &total_time, &af->chunk_tv); rewind(mp3.file); PARA_DEBUG_LOG("chunk_time: %lums\n", tv2ms(&af->chunk_tv)); - tv_scale(30, &af->chunk_tv, &af->eof_tv); + tv_scale(3, &af->chunk_tv, &af->eof_tv); PARA_DEBUG_LOG("eof timeout: %lu\n", tv2ms(&af->eof_tv)); return 1; } @@ -483,6 +483,12 @@ static void mp3_close_audio_file(void) } static const char* mp3_suffixes[] = {"mp3", NULL}; + +/** + * the init function of the mp3 audio format handler + * + * \param p pointer to the struct to initialize + */ void mp3_init(struct audio_format_handler *p) { af = p;