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

storage/Configured: use struct ConfigData

Browse Source
This commit is contained in:
Max Kellermann
2018-07-17 22:57:08 +02:00
parent 667daab056
commit d2594c6380
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Main.cxx
View File

@@ -166,9 +166,9 @@ glue_mapper_init(const ConfigData &config)
#ifdef ENABLE_DATABASE
static void
InitStorage(EventLoop &event_loop)
InitStorage(const ConfigData &config, EventLoop &event_loop)
{
auto storage = CreateConfiguredStorage(event_loop);
auto storage = CreateConfiguredStorage(config, event_loop);
if (storage == nullptr)
return;
@@ -193,7 +193,7 @@ glue_db_init_and_load(const ConfigData &config)
return true;
if (instance->database->GetPlugin().flags & DatabasePlugin::FLAG_REQUIRE_STORAGE) {
InitStorage(instance->io_thread.GetEventLoop());
InitStorage(config, instance->io_thread.GetEventLoop());
if (instance->storage == nullptr) {
delete instance->database;
@@ -204,7 +204,7 @@ glue_db_init_and_load(const ConfigData &config)
return true;
}
} else {
if (IsStorageConfigured())
if (IsStorageConfigured(config))
LogDefault(config_domain,
"Ignoring the storage configuration "
"because the database does not need it");