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/Stats.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 'src/Stats.cxx')
-rw-r--r-- | src/Stats.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/Stats.cxx b/src/Stats.cxx index 4051d8049..c5fcc69e2 100644 --- a/src/Stats.cxx +++ b/src/Stats.cxx @@ -21,8 +21,9 @@ #include "Stats.hxx" #include "PlayerControl.hxx" #include "client/Client.hxx" +#include "Partition.hxx" +#include "Instance.hxx" #include "db/Selection.hxx" -#include "db/DatabaseGlue.hxx" #include "db/DatabasePlugin.hxx" #include "util/Error.hxx" #include "system/Clock.hxx" @@ -60,8 +61,6 @@ void stats_global_init(void) void stats_invalidate() { - assert(GetDatabase() != nullptr); - stats_validity = StatsValidity::INVALID; } @@ -132,7 +131,7 @@ stats_print(Client &client) (unsigned long)(client.player_control.GetTotalPlayTime() + 0.5)); #ifdef ENABLE_DATABASE - const Database *db = GetDatabase(); + const Database *db = client.partition.instance.database; if (db != nullptr) db_stats_print(client, *db); #endif |