X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3_afh.c;h=2b558cbbaa1d8c82fd5fc121b6a1ce30fbff08ee;hp=647098210198225cd9df307c2bc969b7532bc69e;hb=bd10c0f46e0b7eadfb8c6d5cd45581cec253d775;hpb=f652ce6afe7f6fd0e42814505234cbf4321a736e

diff --git a/mp3_afh.c b/mp3_afh.c
index 64709821..2b558cbb 100644
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2003-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -72,11 +72,11 @@ static const char *mode_text[] = {"stereo", "joint stereo", "dual channel", "mon
 
 #include <id3tag.h>
 
-static char *get_latin1(id3_ucs4_t const *string)
+static char *get_utf8(id3_ucs4_t const *string)
 {
 	if (!string)
 		return NULL;
-	return (char *)id3_ucs4_latin1duplicate(string);
+	return (char *)id3_ucs4_utf8duplicate(string);
 }
 
 static char *get_stringlist(union id3_field *field)
@@ -85,7 +85,7 @@ static char *get_stringlist(union id3_field *field)
 	char *result = NULL;
 
 	for (k = 0; k < nstrings; k++) {
-		char *tmp = (char *)get_latin1(id3_field_getstrings(field, k));
+		char *tmp = (char *)get_utf8(id3_field_getstrings(field, k));
 		if (result) {
 			char *tmp2 = result;
 			result = make_message("%s %s", tmp2, tmp);
@@ -101,7 +101,7 @@ static char *get_string(union id3_field *field)
 {
 	id3_ucs4_t const *string = id3_field_getfullstring(field);
 
-	return get_latin1(string);
+	return get_utf8(string);
 }
 
 #define FOR_EACH_FIELD(f, j, fr) for (j = 0; j < (fr)->nfields && \
@@ -139,27 +139,27 @@ static void mp3_get_id3(__a_unused unsigned char *map,
 	}
 	for (i = 0; i < id3_t->nframes; i++) {
 		struct id3_frame *fr = id3_t->frames[i];
-		if (!strcmp(fr->id, "TIT2")) {
+		if (!strcmp(fr->id, ID3_FRAME_TITLE)) {
 			if (!tags->title)
 				tags->title = get_strings(fr);
 			continue;
 		}
-		if (!strcmp(fr->id, "TPE1")) {
+		if (!strcmp(fr->id, ID3_FRAME_ARTIST)) {
 			if (!tags->artist)
 				tags->artist = get_strings(fr);
 			continue;
 		}
-		if (!strcmp(fr->id, "TALB")) {
+		if (!strcmp(fr->id, ID3_FRAME_ALBUM)) {
 			if (!tags->album)
 				tags->album = get_strings(fr);
 			continue;
 		}
-		if (!strcmp(fr->id, "TDRC")) {
+		if (!strcmp(fr->id, ID3_FRAME_YEAR)) {
 			if (!tags->year)
 				tags->year = get_strings(fr);
 			continue;
 		}
-		if (!strcmp(fr->id, "COMM")) {
+		if (!strcmp(fr->id, ID3_FRAME_COMMENT)) {
 			if (!tags->comment)
 				tags->comment = get_strings(fr);
 			continue;