aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-02-07 22:56:30 +0100
committerMax Kellermann <max@duempel.org>2014-02-07 22:58:21 +0100
commitb531c4c2feb39b6c6d741d384fcc192c54b3a702 (patch)
treeb243daece9130f735b3bbfa545cca50cde8a82df /src
parent4b010df99e35e1bc0d893c095f7f1f5bedb524d2 (diff)
downloadmpd-b531c4c2feb39b6c6d741d384fcc192c54b3a702.tar.gz
mpd-b531c4c2feb39b6c6d741d384fcc192c54b3a702.tar.xz
mpd-b531c4c2feb39b6c6d741d384fcc192c54b3a702.zip
OtherCommands: use Storage::MapUTF8() instead of Mapper.cxx
Diffstat (limited to '')
-rw-r--r--src/command/OtherCommands.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/command/OtherCommands.cxx b/src/command/OtherCommands.cxx
index 9455971e8..485e830d4 100644
--- a/src/command/OtherCommands.cxx
+++ b/src/command/OtherCommands.cxx
@@ -21,13 +21,13 @@
#include "OtherCommands.hxx"
#include "CommandError.hxx"
#include "db/Uri.hxx"
+#include "storage/StorageInterface.hxx"
#include "DetachedSong.hxx"
#include "SongPrint.hxx"
#include "TagPrint.hxx"
#include "TagStream.hxx"
#include "tag/TagHandler.hxx"
#include "TimePrint.hxx"
-#include "Mapper.hxx"
#include "decoder/DecoderPrint.hxx"
#include "protocol/ArgParser.hxx"
#include "protocol/Result.hxx"
@@ -349,9 +349,11 @@ handle_config(Client &client,
}
#ifdef ENABLE_DATABASE
- const char *path = mapper_get_music_directory_utf8();
- if (path != nullptr)
- client_printf(client, "music_directory: %s\n", path);
+ const Storage *storage = client.GetStorage();
+ if (storage != nullptr) {
+ const auto path = storage->MapUTF8("");
+ client_printf(client, "music_directory: %s\n", path.c_str());
+ }
#endif
return CommandResult::OK;