diff options
| author | Max Kellermann <max@duempel.org> | 2009-07-15 18:58:19 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-07-15 18:58:19 +0200 |
| commit | c134adbcbf1197d8f6e17ad30252af947294dbf7 (patch) | |
| tree | 9150619424e2564c09786db518f656867418cd4a /src/mapper.c | |
| parent | 7bc8c7518b088d160f9861cac418d080c3f69531 (diff) | |
| download | mpd-c134adbcbf1197d8f6e17ad30252af947294dbf7.tar.gz mpd-c134adbcbf1197d8f6e17ad30252af947294dbf7.tar.xz mpd-c134adbcbf1197d8f6e17ad30252af947294dbf7.zip | |
mapper: pass music and playlist directory to mapper_init()
Added another glue function in main().
Diffstat (limited to 'src/mapper.c')
| -rw-r--r-- | src/mapper.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/src/mapper.c b/src/mapper.c index aac7c0c48..cec621a43 100644 --- a/src/mapper.c +++ b/src/mapper.c @@ -25,7 +25,6 @@ #include "directory.h" #include "song.h" #include "path.h" -#include "conf.h" #include <glib.h> @@ -90,24 +89,13 @@ mapper_set_playlist_dir(const char *path) playlist_dir); } -void mapper_init(void) +void mapper_init(const char *_music_dir, const char *_playlist_dir) { - const char *path; - - path = config_get_path(CONF_MUSIC_DIR); - if (path != NULL) - mapper_set_music_dir(path); -#if GLIB_CHECK_VERSION(2,14,0) - else { - path = g_get_user_special_dir(G_USER_DIRECTORY_MUSIC); - if (path != NULL) - mapper_set_music_dir(path); - } -#endif + if (_music_dir != NULL) + mapper_set_music_dir(_music_dir); - path = config_get_path(CONF_PLAYLIST_DIR); - if (path != NULL) - mapper_set_playlist_dir(path); + if (_playlist_dir != NULL) + mapper_set_playlist_dir(_playlist_dir); } void mapper_finish(void) |