oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

TagId3: disable charset conversion without GLib

Browse Source
This commit is contained in:
Max Kellermann 2014-03-01 19:18:48 +01:00
parent 14168eadb2
commit 07c1ba1f5e
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tag/TagId3.cxx
View File

@ -33,7 +33,10 @@
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include "fs/FileSystem.hxx" #include "fs/FileSystem.hxx"
#ifdef HAVE_GLIB
#include <glib.h> #include <glib.h>
#endif
#include <id3tag.h> #include <id3tag.h>
#include <string> #include <string>
@ -90,6 +93,7 @@ import_id3_string(bool is_id3v1, const id3_ucs4_t *ucs4)
{ {
id3_utf8_t *utf8; id3_utf8_t *utf8;
#ifdef HAVE_GLIB
/* use encoding field here? */ /* use encoding field here? */
const char *encoding; const char *encoding;
if (is_id3v1 && if (is_id3v1 &&
@ -112,10 +116,15 @@ import_id3_string(bool is_id3v1, const id3_ucs4_t *ucs4)
} }
free(isostr); free(isostr);
} else { } else {
#else
(void)is_id3v1;
#endif
utf8 = id3_ucs4_utf8duplicate(ucs4); utf8 = id3_ucs4_utf8duplicate(ucs4);
if (gcc_unlikely(utf8 == nullptr)) if (gcc_unlikely(utf8 == nullptr))
return nullptr; return nullptr;
#ifdef HAVE_GLIB
} }
#endif
id3_utf8_t *utf8_stripped = (id3_utf8_t *) id3_utf8_t *utf8_stripped = (id3_utf8_t *)
xstrdup(Strip((char *)utf8)); xstrdup(Strip((char *)utf8));