diff options
| author | Max Kellermann <max@duempel.org> | 2014-02-01 00:26:34 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-02-04 11:22:33 +0100 |
| commit | cf6281a5a758e4b93d67f7fd5804a8cff60ddbf9 (patch) | |
| tree | 7368011b1ecf5ae6db6dcafb676fddf03ff9d823 /src/StateFile.cxx | |
| parent | f00710a57e80738c33255eaa1347ab776fbce869 (diff) | |
| download | mpd-cf6281a5a758e4b93d67f7fd5804a8cff60ddbf9.tar.gz mpd-cf6281a5a758e4b93d67f7fd5804a8cff60ddbf9.tar.xz mpd-cf6281a5a758e4b93d67f7fd5804a8cff60ddbf9.zip | |
Instance: add Database attribute
Move from db/DatabaseGlue.cxx, eliminating global variable.
Diffstat (limited to '')
| -rw-r--r-- | src/StateFile.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/StateFile.cxx b/src/StateFile.cxx index 6c01be53c..e46af1c3e 100644 --- a/src/StateFile.cxx +++ b/src/StateFile.cxx @@ -23,9 +23,9 @@ #include "PlaylistState.hxx" #include "fs/TextFile.hxx" #include "Partition.hxx" +#include "Instance.hxx" #include "mixer/Volume.hxx" #include "SongLoader.hxx" -#include "db/DatabaseGlue.hxx" #include "fs/FileSystem.hxx" #include "util/Domain.hxx" #include "Log.hxx" @@ -98,7 +98,11 @@ StateFile::Read() return; } - const SongLoader song_loader(nullptr, GetDatabase()); +#ifdef ENABLE_DATABASE + const SongLoader song_loader(partition.instance.database); +#else + const SongLoader song_loader(nullptr); +#endif const char *line; while ((line = file.ReadLine()) != NULL) { |