From e42637226f7168c17f8eec6806fcd4d5b45289f0 Mon Sep 17 00:00:00 2001 From: Denis Krjuchkov Date: Sat, 7 Dec 2013 03:46:14 +0600 Subject: [PATCH] Main: use standard directory API --- src/Main.cxx | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Main.cxx b/src/Main.cxx index 9a70b0015..2d25297c9 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -50,6 +50,7 @@ #include "IOThread.hxx" #include "fs/AllocatedPath.hxx" #include "fs/Config.hxx" +#include "fs/StandardDirectory.hxx" #include "PlaylistRegistry.hxx" #include "ZeroconfGlue.hxx" #include "DecoderList.hxx" @@ -132,13 +133,9 @@ glue_mapper_init(Error &error) return false; if (music_dir.IsNull()) { - const char *path = - g_get_user_special_dir(G_USER_DIRECTORY_MUSIC); - if (path != nullptr) { - music_dir = AllocatedPath::FromUTF8(path, error); - if (music_dir.IsNull()) - return false; - } + music_dir = GetUserMusicDir(); + if (music_dir.IsNull()) + return false; } mapper_init(std::move(music_dir), std::move(playlist_dir));