1 files changed, 7 insertions, 37 deletions

diff --git a/src/mapper.c b/src/mapper.c
index aac7c0c48..9a122d068 100644
--- a/src/mapper.c
+++ b/src/mapper.c
@@ -25,16 +25,11 @@
 #include "directory.h"
 #include "song.h"
 #include "path.h"
-#include "conf.h"
 
 #include <glib.h>
 
 #include <assert.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include <string.h>
-#include <errno.h>
 
 static char *music_dir;
 static size_t music_dir_length;
@@ -58,17 +53,10 @@ strdup_chop_slash(const char *path_fs)
 static void
 mapper_set_music_dir(const char *path)
 {
-	int ret;
-	struct stat st;
-
 	music_dir = strdup_chop_slash(path);
 	music_dir_length = strlen(music_dir);
 
-	ret = stat(music_dir, &st);
-	if (ret < 0)
-		g_warning("failed to stat music directory \"%s\": %s",
-			  music_dir, g_strerror(errno));
-	else if (!S_ISDIR(st.st_mode))
+	if (!g_file_test(music_dir, G_FILE_TEST_IS_DIR))
 		g_warning("music directory is not a directory: \"%s\"",
 			  music_dir);
 }
@@ -76,38 +64,20 @@ mapper_set_music_dir(const char *path)
 static void
 mapper_set_playlist_dir(const char *path)
 {
-	int ret;
-	struct stat st;
-
 	playlist_dir = g_strdup(path);
 
-	ret = stat(playlist_dir, &st);
-	if (ret < 0)
-		g_warning("failed to stat playlist directory \"%s\": %s",
-			  playlist_dir, g_strerror(errno));
-	else if (!S_ISDIR(st.st_mode))
+	if (!g_file_test(playlist_dir, G_FILE_TEST_IS_DIR))
 		g_warning("playlist directory is not a directory: \"%s\"",
 			  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)