From 1ae89728593fce4a40882fa133b9db269015da8f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 13 Aug 2012 23:37:50 +0200 Subject: mapper: fix non-UTF8 music directory name Duplicate the music_dir variable: one encoded in UTF-8, and another one using the configured filesystem character set. This fixes an ancient MPD bug. --- src/mapper.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'src/mapper.h') diff --git a/src/mapper.h b/src/mapper.h index ed4a60b56..d6184a175 100644 --- a/src/mapper.h +++ b/src/mapper.h @@ -36,9 +36,20 @@ void mapper_init(const char *_music_dir, const char *_playlist_dir); void mapper_finish(void); +/** + * Return the absolute path of the music directory encoded in UTF-8. + */ +G_GNUC_CONST +const char * +mapper_get_music_directory_utf8(void); + +/** + * Return the absolute path of the music directory encoded in the + * filesystem character set. + */ G_GNUC_CONST const char * -mapper_get_music_directory(void); +mapper_get_music_directory_fs(void); /** * Returns true if a music directory was configured. @@ -47,7 +58,7 @@ G_GNUC_CONST static inline bool mapper_has_music_directory(void) { - return mapper_get_music_directory() != NULL; + return mapper_get_music_directory_utf8() != NULL; } /** -- cgit v1.2.3