From b531c4c2feb39b6c6d741d384fcc192c54b3a702 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 7 Feb 2014 22:56:30 +0100
Subject: [PATCH] OtherCommands: use Storage::MapUTF8() instead of Mapper.cxx
---
src/command/OtherCommands.cxx | 10 ++++++----
1 file 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;