From cf6281a5a758e4b93d67f7fd5804a8cff60ddbf9 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 1 Feb 2014 00:26:34 +0100 Subject: Instance: add Database attribute Move from db/DatabaseGlue.cxx, eliminating global variable. --- src/db/DatabasePrint.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/db/DatabasePrint.cxx') diff --git a/src/db/DatabasePrint.cxx b/src/db/DatabasePrint.cxx index 9ed0b0826..669a804be 100644 --- a/src/db/DatabasePrint.cxx +++ b/src/db/DatabasePrint.cxx @@ -28,7 +28,6 @@ #include "LightSong.hxx" #include "LightDirectory.hxx" #include "PlaylistInfo.hxx" -#include "DatabaseGlue.hxx" #include "DatabasePlugin.hxx" #include @@ -129,7 +128,7 @@ bool db_selection_print(Client &client, const DatabaseSelection &selection, bool full, Error &error) { - const Database *db = GetDatabase(error); + const Database *db = client.GetDatabase(error); if (db == nullptr) return false; @@ -173,7 +172,7 @@ searchStatsForSongsIn(Client &client, const char *name, const SongFilter *filter, Error &error) { - const Database *db = GetDatabase(error); + const Database *db = client.GetDatabase(error); if (db == nullptr) return false; @@ -229,7 +228,7 @@ listAllUniqueTags(Client &client, int type, const SongFilter *filter, Error &error) { - const Database *db = GetDatabase(error); + const Database *db = client.GetDatabase(error); if (db == nullptr) return false; -- cgit v1.2.3