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

Main: wrap the Storage instance in CompositeStorage

Browse Source
This commit is contained in:
Max Kellermann 2014-02-09 07:44:07 +01:00
parent 59ce67e2e5
commit a9fefcf600
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Instance.hxx
View File

@ -63,6 +63,10 @@ struct Instance final
#ifdef ENABLE_DATABASE #ifdef ENABLE_DATABASE
Database *database; Database *database;
/**
* This is really a #CompositeStorage. To avoid heavy include
* dependencies, we declare it as just #Storage.
*/
Storage *storage; Storage *storage;
UpdateService *update; UpdateService *update;

13
src/Main.cxx
View File

@ -71,6 +71,7 @@
#include "db/DatabaseSimple.hxx" #include "db/DatabaseSimple.hxx"
#include "db/plugins/SimpleDatabasePlugin.hxx" #include "db/plugins/SimpleDatabasePlugin.hxx"
#include "storage/Configured.hxx" #include "storage/Configured.hxx"
#include "storage/CompositeStorage.hxx"
#endif #endif
#ifdef ENABLE_NEIGHBOR_PLUGINS #ifdef ENABLE_NEIGHBOR_PLUGINS
@ -148,8 +149,16 @@ glue_mapper_init(Error &error)
static bool static bool
InitStorage(Error &error) InitStorage(Error &error)
{ {
instance->storage = CreateConfiguredStorage(error); Storage *storage = CreateConfiguredStorage(error);
return !error.IsDefined(); if (storage == nullptr)
return !error.IsDefined();
assert(!error.IsDefined());
CompositeStorage *composite = new CompositeStorage();
instance->storage = composite;
composite->Mount("", storage);
return true;
} }
/** /**