X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3_afh.c;h=4093a31394e26442172f6df0a6d906355c5e6ada;hp=710b6a50aa149f5f2192c591a1e0a50c649543dd;hb=1afd45b1b5c80e73c017ef27c54f0696a40f4e33;hpb=9207a81bf1bb5b6bd4db7e2640994e0cfc5f9a3f

diff --git a/mp3_afh.c b/mp3_afh.c
index 710b6a50..4093a313 100644
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2003-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -144,11 +144,11 @@ static void write_info_str(struct afh_info *afhi)
 		"%s: A: %s, Y: %s, C: %s\n", /* taginfo 2*/
 		status_item_list[SI_AUDIO_FILE_INFO], mp3.vbr? 'v' : 'c',
 			header_mode(&mp3.header),
-		status_item_list[SI_TAG_INFO1], v && *mp3.id3.title?
+		status_item_list[SI_TAGINFO1], v && *mp3.id3.title?
 			mp3.id3.title : "(title tag not set)",
 			v && *mp3.id3.artist?
 			mp3.id3.artist : "(artist tag not set)",
-		status_item_list[SI_TAG_INFO2],
+		status_item_list[SI_TAGINFO2],
 			v && *mp3.id3.album?
 				mp3.id3.album : "(album tag not set)",
 			v && *mp3.id3.year? mp3.id3.year : "????",
@@ -163,7 +163,7 @@ static void write_info_str(struct afh_info *afhi)
 static char *unpad(char *string)
 {
 	char *pos = string + strlen(string) - 1;
-	while (isspace(pos[0]))
+	while (para_isspace(pos[0]))
 		(pos--)[0] = 0;
 	return string;
 }
@@ -273,7 +273,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_DEBUG_LOG("%s", "no id3 tag\n");
+		PARA_DEBUG_LOG("no id3 tag\n");
 		return;
 	}
 	*fpos = numbytes - 125;
@@ -395,7 +395,7 @@ static int mp3_read_info(unsigned char *map, size_t numbytes,
 	PARA_DEBUG_LOG("eof timeout: %lu\n", tv2ms(&afhi->eof_tv));
 	return 1;
 err_out:
-	PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+	PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	free(afhi->chunk_table);
 	return ret;
 }