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

Stats: pass Database reference around

Browse Source 
Call GetDatabase() only once.
This commit is contained in:
Max Kellermann 2014-02-01 00:38:57 +01:00
parent 636d28b784
commit 981080500b
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Stats.cxx
View File

@ -66,7 +66,7 @@ stats_invalidate()
} }
static bool static bool
stats_update() stats_update(const Database &db)
{ {
switch (stats_validity) { switch (stats_validity) {
case StatsValidity::INVALID: case StatsValidity::INVALID:
@ -82,7 +82,7 @@ stats_update()
Error error; Error error;
const DatabaseSelection selection("", true); const DatabaseSelection selection("", true);
if (GetDatabase()->GetStats(selection, stats, error)) { if (db.GetStats(selection, stats, error)) {
stats_validity = StatsValidity::VALID; stats_validity = StatsValidity::VALID;
return true; return true;
} else { } else {
@ -94,11 +94,9 @@ stats_update()
} }
static void static void
db_stats_print(Client &client) db_stats_print(Client &client, const Database &db)
{ {
assert(GetDatabase() != nullptr); if (!stats_update(db))
if (!stats_update())
return; return;
client_printf(client, client_printf(client,
@ -111,7 +109,7 @@ db_stats_print(Client &client)
stats.song_count, stats.song_count,
stats.total_duration); stats.total_duration);
const time_t update_stamp = GetDatabase()->GetUpdateStamp(); const time_t update_stamp = db.GetUpdateStamp();
if (update_stamp > 0) if (update_stamp > 0)
client_printf(client, client_printf(client,
"db_update: %lu\n", "db_update: %lu\n",
@ -134,7 +132,8 @@ stats_print(Client &client)
(unsigned long)(client.player_control.GetTotalPlayTime() + 0.5)); (unsigned long)(client.player_control.GetTotalPlayTime() + 0.5));
#ifdef ENABLE_DATABASE #ifdef ENABLE_DATABASE
if (GetDatabase() != nullptr) const Database *db = GetDatabase();
db_stats_print(client); if (db != nullptr)
db_stats_print(client, *db);
#endif #endif
} }