diff options
| author | Max Kellermann <max@duempel.org> | 2012-08-14 02:39:03 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-08-14 02:39:03 +0200 |
| commit | 5cc3338267214eb050e39bc509d8b4258cec6afd (patch) | |
| tree | e513393222f18a5d8d43fec116dac055e1a24d1a /src/mapper.h | |
| parent | 3047bdf6531d6718239d1e2e0f201d0b8e54dba1 (diff) | |
| parent | 1ae89728593fce4a40882fa133b9db269015da8f (diff) | |
| download | mpd-5cc3338267214eb050e39bc509d8b4258cec6afd.tar.gz mpd-5cc3338267214eb050e39bc509d8b4258cec6afd.tar.xz mpd-5cc3338267214eb050e39bc509d8b4258cec6afd.zip | |
Merge branch 'v0.17.x'
Conflicts:
src/mapper.h
Diffstat (limited to 'src/mapper.h')
| -rw-r--r-- | src/mapper.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/mapper.h b/src/mapper.h index f57e3c9a8..b4e314569 100644 --- a/src/mapper.h +++ b/src/mapper.h @@ -39,9 +39,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. + */ +gcc_const +const char * +mapper_get_music_directory_utf8(void); + +/** + * Return the absolute path of the music directory encoded in the + * filesystem character set. + */ gcc_const const char * -mapper_get_music_directory(void); +mapper_get_music_directory_fs(void); /** * Returns true if a music directory was configured. @@ -50,7 +61,7 @@ gcc_const static inline bool mapper_has_music_directory(void) { - return mapper_get_music_directory() != NULL; + return mapper_get_music_directory_utf8() != NULL; } /** |