X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3_afh.c;h=f7334488113ad85922313f5273fb998df36840a6;hp=ebb6bf5291281d2fa9343fea21544617c79bfcdc;hb=a6cbab95272b31c55b2b41e1d3dd55743c7c774f;hpb=8694f85b70488f2cdb48a1e853bdfae68dabc99f;ds=sidebyside diff --git a/mp3_afh.c b/mp3_afh.c index ebb6bf52..f7334488 100644 --- a/mp3_afh.c +++ b/mp3_afh.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2008 Andre Noll + * Copyright (C) 2003-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -71,21 +71,6 @@ static const int mp3info_bitrate[2][3][14] = { static const int frame_size_index[] = {24000, 72000, 72000}; static const char *mode_text[] = {"stereo", "joint stereo", "dual channel", "mono", "invalid"}; -static char *make_taginfo(char *title, char *artist, char *album, char *year, - char *comment) -{ - return make_message("%s: %s, by %s\n" /* taginfo1 */ - "%s: A: %s, Y: %s, C: %s\n", /* taginfo 2*/ - status_item_list[SI_TAGINFO1], - (title && *title)? title : "(title tag not set)", - (artist && *artist)? artist : "(artist tag not set)", - status_item_list[SI_TAGINFO2], - (album && *album)? album : "(album tag not set)", - (year && *year)? year : "????", - (comment && *comment)? comment : "(comment tag not set)" - ); -} - #ifdef HAVE_LIBID3TAG #include @@ -295,7 +280,7 @@ static int frame_length(struct mp3header *header) static int compare_headers(struct mp3header *h1,struct mp3header *h2) { - if ((*(uint*)h1) == (*(uint*)h2)) + if ((*(unsigned int*)h1) == (*(unsigned int*)h2)) return 1; if ((h1->version == h2->version) && (h1->layer == h2->layer) &&