Mapper: move map_song_detach() to db/DatabaseSong.cxx

Use Storage::MapUTF8() internally, don't use global variables.
This commit is contained in:
Max Kellermann
2014-02-07 00:29:07 +01:00
parent 19a982cf69
commit c13810ebaa
17 changed files with 97 additions and 55 deletions

View File

@@ -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),