oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Instance: add Database attribute

Browse Source 
Move from db/DatabaseGlue.cxx, eliminating global variable.
This commit is contained in:
Max Kellermann
2014-02-01 00:26:34 +01:00
parent f00710a57e
commit cf6281a5a7
21 changed files with 106 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/SongLoader.hxx
View File

@@ -45,19 +45,16 @@ class SongLoader {
public:
#ifdef ENABLE_DATABASE
SongLoader(const Client *_client, const Database *_db=nullptr)
:client(_client), db(_db) {}
explicit SongLoader(const Client &_client)
:client(&_client), db(nullptr) {}
explicit SongLoader(const Client &_client);
explicit SongLoader(const Database *_db)
:client(nullptr), db(_db) {}
explicit SongLoader(std::nullptr_t)
:client(nullptr), db(nullptr) {}
explicit SongLoader(const Client &_client, const Database *_db)
:client(&_client), db(_db) {}
#else
explicit SongLoader(const Client &_client)
:client(&_client) {}
explicit SongLoader(const Client *_client)
:client(_client) {}
explicit SongLoader(std::nullptr_t)
:client(nullptr) {}
#endif
gcc_nonnull_all