From c13810ebaa7075284691eb2add089ba407dfd1ea Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 7 Feb 2014 00:29:07 +0100 Subject: Mapper: move map_song_detach() to db/DatabaseSong.cxx Use Storage::MapUTF8() internally, don't use global variables. --- src/SongLoader.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/SongLoader.cxx') diff --git a/src/SongLoader.cxx b/src/SongLoader.cxx index 08aa01296..f2cf216a7 100644 --- a/src/SongLoader.cxx +++ b/src/SongLoader.cxx @@ -36,7 +36,8 @@ #ifdef ENABLE_DATABASE SongLoader::SongLoader(const Client &_client) - :client(&_client), db(_client.GetDatabase(IgnoreError())) {} + :client(&_client), db(_client.GetDatabase(IgnoreError())), + storage(_client.GetStorage()) {} #endif @@ -100,7 +101,8 @@ SongLoader::LoadSong(const char *uri_utf8, Error &error) const #ifdef ENABLE_DATABASE if (db != nullptr) - return DatabaseDetachSong(*db, uri_utf8, error); + return DatabaseDetachSong(*db, *storage, + uri_utf8, error); #endif error.Set(playlist_domain, int(PlaylistResult::NO_SUCH_SONG), -- cgit v1.2.3