diff options
| author | Max Kellermann <max@duempel.org> | 2014-02-07 00:29:07 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-02-07 00:42:14 +0100 |
| commit | c13810ebaa7075284691eb2add089ba407dfd1ea (patch) | |
| tree | 1ebeb2104ee4a3e73f49416267aec2e79943821b /src/SongLoader.hxx | |
| parent | 19a982cf693e660ce296a29a9830f1e94d9f1b4c (diff) | |
| download | mpd-c13810ebaa7075284691eb2add089ba407dfd1ea.tar.gz mpd-c13810ebaa7075284691eb2add089ba407dfd1ea.tar.xz mpd-c13810ebaa7075284691eb2add089ba407dfd1ea.zip | |
Mapper: move map_song_detach() to db/DatabaseSong.cxx
Use Storage::MapUTF8() internally, don't use global variables.
Diffstat (limited to 'src/SongLoader.hxx')
| -rw-r--r-- | src/SongLoader.hxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/SongLoader.hxx b/src/SongLoader.hxx index 9914db8e6..c8cd87024 100644 --- a/src/SongLoader.hxx +++ b/src/SongLoader.hxx @@ -27,6 +27,7 @@ class Client; class Database; +class Storage; class DetachedSong; class Error; @@ -41,19 +42,21 @@ class SongLoader { #ifdef ENABLE_DATABASE const Database *const db; + const Storage *const storage; #endif public: #ifdef ENABLE_DATABASE explicit SongLoader(const Client &_client); - explicit SongLoader(const Database *_db) - :client(nullptr), db(_db) {} - explicit SongLoader(const Client &_client, const Database *_db) - :client(&_client), db(_db) {} + SongLoader(const Database *_db, const Storage *_storage) + :client(nullptr), db(_db), storage(_storage) {} + SongLoader(const Client &_client, const Database *_db, + const Storage *_storage) + :client(&_client), db(_db), storage(_storage) {} #else explicit SongLoader(const Client &_client) :client(&_client) {} - explicit SongLoader(std::nullptr_t) + explicit SongLoader(std::nullptr_t, std::nullptr_t) :client(nullptr) {} #endif |