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

7
src/db/plugins/ProxyDatabasePlugin.cxx
View File

@@ -107,7 +107,9 @@ public:
ProxyDatabase(EventLoop &_loop, DatabaseListener &_listener,
const ConfigBlock &block);
static Database *Create(EventLoop &loop, DatabaseListener &listener,
static Database *Create(EventLoop &main_event_loop,
EventLoop &io_event_loop,
DatabaseListener &listener,
const ConfigBlock &block);
void Open() override;
@@ -345,7 +347,8 @@ ProxyDatabase::ProxyDatabase(EventLoop &_loop, DatabaseListener &_listener,
}
Database *
ProxyDatabase::Create(EventLoop &loop, DatabaseListener &listener,
ProxyDatabase::Create(EventLoop &loop, EventLoop &,
DatabaseListener &listener,
const ConfigBlock &block)
{
return new ProxyDatabase(loop, listener, block);

2
src/db/plugins/simple/SimpleDatabasePlugin.cxx
View File

@@ -83,7 +83,7 @@ inline SimpleDatabase::SimpleDatabase(AllocatedPath &&_path,
}
Database *
SimpleDatabase::Create(gcc_unused EventLoop &loop,
SimpleDatabase::Create(EventLoop &, EventLoop &,
gcc_unused DatabaseListener &listener,
const ConfigBlock &block)
{

4
src/db/plugins/simple/SimpleDatabasePlugin.hxx
View File

@@ -72,7 +72,9 @@ class SimpleDatabase : public Database {
SimpleDatabase(AllocatedPath &&_path, bool _compress);
public:
static Database *Create(EventLoop &loop, DatabaseListener &listener,
static Database *Create(EventLoop &main_event_loop,
EventLoop &io_event_loop,
DatabaseListener &listener,
const ConfigBlock &block);
gcc_pure

6
src/db/plugins/upnp/UpnpDatabasePlugin.cxx
View File

@@ -75,7 +75,9 @@ class UpnpDatabase : public Database {
public:
UpnpDatabase():Database(upnp_db_plugin) {}
static Database *Create(EventLoop &loop, DatabaseListener &listener,
static Database *Create(EventLoop &main_event_loop,
EventLoop &io_event_loop,
DatabaseListener &listener,
const ConfigBlock &block);
void Open() override;
@@ -138,7 +140,7 @@ private:
};
Database *
UpnpDatabase::Create(gcc_unused EventLoop &loop,
UpnpDatabase::Create(EventLoop &, EventLoop &,
gcc_unused DatabaseListener &listener,
const ConfigBlock &)
{