From a998048a7a99a5d8327896ecee3cecc4ae7e8368 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 3 Jun 2012 22:00:31 +0200 Subject: [PATCH] mp3_afh: Switch to UTF-8 encoding. The interface of libid3tag allows to get the tag contents in various formats. Currently, we always call the latin1 variants of these library functions. However, as UTF-8 encoding is more widespread these days and almost all distributions, including the two year old Ubuntu lucid, have switched to UTF-8, UTF-8 is probably a better choice today. This patch changes mp3_afh.c to use the UTF-8 variants instead. --- mp3_afh.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mp3_afh.c b/mp3_afh.c index ca703f52..15ee27fe 100644 --- a/mp3_afh.c +++ b/mp3_afh.c @@ -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 && \ -- 2.39.2