From 2d5413fc3ba2dc77189bed3dfbbc65ad4243e477 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 29 Oct 2013 20:33:20 +0100 Subject: DatabaseSelection: use std::string --- src/db/ProxyDatabasePlugin.cxx | 2 +- src/db/SimpleDatabasePlugin.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/db') 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); -- cgit v1.2.3