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

db/DatabasePlugin: pass EventThread's EventLoop to create()

Browse Source 
Allows database plugins to use the EventThread, e.g. for CURL
integration.
This commit is contained in:
Max Kellermann
2017-08-24 19:49:54 +02:00
parent 7e76656a18
commit 28a2d41b85
11 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/db/Configured.cxx
View File

@@ -28,7 +28,7 @@
#include "util/RuntimeError.hxx"
Database *
CreateConfiguredDatabase(EventLoop &main_event_loop,
CreateConfiguredDatabase(EventLoop &main_event_loop, EventLoop &io_event_loop,
DatabaseListener &listener)
{
const auto *param = config_get_block(ConfigBlockOption::DATABASE);
@@ -39,12 +39,12 @@ CreateConfiguredDatabase(EventLoop &main_event_loop,
param->line, path->line);
if (param != nullptr)
return DatabaseGlobalInit(main_event_loop,
return DatabaseGlobalInit(main_event_loop, io_event_loop,
listener, *param);
else if (path != nullptr) {
ConfigBlock block(path->line);
block.AddBlockParam("path", path->value.c_str(), path->line);
return DatabaseGlobalInit(main_event_loop,
return DatabaseGlobalInit(main_event_loop, io_event_loop,
listener, block);
} else {
/* if there is no override, use the cache directory */
@@ -61,7 +61,7 @@ CreateConfiguredDatabase(EventLoop &main_event_loop,
ConfigBlock block;
block.AddBlockParam("path", db_file_utf8.c_str(), -1);
return DatabaseGlobalInit(main_event_loop,
return DatabaseGlobalInit(main_event_loop, io_event_loop,
listener, block);
}
}