aboutsummaryrefslogtreecommitdiffstats
path: root/src/db
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-10-29 20:33:20 +0100
committerMax Kellermann <max@duempel.org>2013-10-29 20:36:52 +0100
commit2d5413fc3ba2dc77189bed3dfbbc65ad4243e477 (patch)
tree571e3b4cb870602c3da3d74b82fa5fdb8bb8cbf3 /src/db
parenta6aa0e4cbf3068ed5a61b7bcef705800caa9fc41 (diff)
downloadmpd-2d5413fc3ba2dc77189bed3dfbbc65ad4243e477.tar.gz
mpd-2d5413fc3ba2dc77189bed3dfbbc65ad4243e477.tar.xz
mpd-2d5413fc3ba2dc77189bed3dfbbc65ad4243e477.zip
DatabaseSelection: use std::string
Diffstat (limited to 'src/db')
-rw-r--r--src/db/ProxyDatabasePlugin.cxx2
-rw-r--r--src/db/SimpleDatabasePlugin.cxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/db/ProxyDatabasePlugin.cxx b/src/db/ProxyDatabasePlugin.cxx
index 3293c26b5..e859e11eb 100644
--- a/src/db/ProxyDatabasePlugin.cxx
+++ b/src/db/ProxyDatabasePlugin.cxx
@@ -398,7 +398,7 @@ ProxyDatabase::Visit(const DatabaseSelection &selection,
// TODO: match
// TODO: auto-reconnect
- return ::Visit(connection, selection.uri, selection.recursive,
+ return ::Visit(connection, selection.uri.c_str(), selection.recursive,
visit_directory, visit_song, visit_playlist,
error);
}
diff --git a/src/db/SimpleDatabasePlugin.cxx b/src/db/SimpleDatabasePlugin.cxx
index 55c9d47a8..4a6d203b3 100644
--- a/src/db/SimpleDatabasePlugin.cxx
+++ b/src/db/SimpleDatabasePlugin.cxx
@@ -239,10 +239,10 @@ SimpleDatabase::Visit(const DatabaseSelection &selection,
{
ScopeDatabaseLock protect;
- const Directory *directory = root->LookupDirectory(selection.uri);
+ const Directory *directory = root->LookupDirectory(selection.uri.c_str());
if (directory == nullptr) {
if (visit_song) {
- Song *song = root->LookupSong(selection.uri);
+ Song *song = root->LookupSong(selection.uri.c_str());
if (song != nullptr)
return !selection.Match(*song) ||
visit_song(*song, error);