X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3_afh.c;h=e36cdef934f238534eb50346869bfa20e9d1e38e;hp=8d4a5416308b140b34bfc68ce707b477ce92d01d;hb=14fe3da6c11b8085b11ef04f5659a18716a904ff;hpb=ae0e4594c6a0312c5b4b4c0bde86f9c12253d11b diff --git a/mp3_afh.c b/mp3_afh.c index 8d4a5416..e36cdef9 100644 --- a/mp3_afh.c +++ b/mp3_afh.c @@ -1,19 +1,7 @@ /* * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file mp3_afh.c para_server's mp3 audio format handler */ @@ -28,9 +16,12 @@ * Johannes Overmann */ -#include "server.h" +#include "para.h" #include "error.h" +#include "afh.h" #include "string.h" +#include "afs.h" +#include "server.h" /** \cond some defines and structs which are only used in this file */ @@ -281,7 +272,7 @@ static void mp3_get_id3(unsigned char *map, size_t numbytes, off_t *fpos) return; *fpos = numbytes - 128; if (strncmp("TAG", (char *) map + *fpos, 3)) { - PARA_INFO_LOG("%s", "no id3 tag\n"); + PARA_DEBUG_LOG("%s", "no id3 tag\n"); return; } *fpos = numbytes - 125; @@ -411,7 +402,7 @@ err_out: /* * Read mp3 information from audio file */ -static int mp3_get_file_info(char *map, size_t numbytes, +int mp3_get_file_info(char *map, size_t numbytes, struct audio_format_info *afi) { int ret;