X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3_afh.c;h=ece13e1f925e857cc43acc9437b9b7547fa621f8;hp=ca703f52b0a4a372437b5cf226d7fadda888c5c4;hb=9f7a4958d65dd436dff90b37036ba01ce83066d5;hpb=1cefe6a503c74d609db4e99e689d46575a5e40fd diff --git a/mp3_afh.c b/mp3_afh.c index ca703f52..ece13e1f 100644 --- a/mp3_afh.c +++ b/mp3_afh.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2012 Andre Noll + * Copyright (C) 2003-2013 Andre Noll * * 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 -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 && \