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

14
src/Instance.cxx
View File

@@ -22,10 +22,18 @@
#include "Partition.hxx"
#include "Idle.hxx"
#include "Stats.hxx"
#include "db/DatabaseGlue.hxx"
#include "db/DatabaseError.hxx"
#ifdef ENABLE_DATABASE
Database *
Instance::GetDatabase(Error &error)
{
if (database == nullptr)
error.Set(db_domain, DB_DISABLED, "No database");
return database;
}
void
Instance::DeleteSong(const char *uri)
{
@@ -35,8 +43,10 @@ Instance::DeleteSong(const char *uri)
void
Instance::DatabaseModified()
{
assert(database != nullptr);
stats_invalidate();
partition->DatabaseModified(*GetDatabase());
partition->DatabaseModified(*database);
idle_add(IDLE_DATABASE);
}