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

lib/upnp/Discovery: use CURL instead of UpnpDownloadUrlItem()

Browse Source 
We can do CURL requests asynchronously, and we don't need a
synchronous WorkQueue thread for that.

This allows parallelizing lookups and allows immediate cancellation.
This commit is contained in:
Max Kellermann
2017-01-26 09:34:53 +01:00
parent 28a2d41b85
commit c8f7a859ea
7 changed files with 157 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,11 +69,14 @@ public:
};
class UpnpDatabase : public Database {
EventLoop &event_loop;
UpnpClient_Handle handle;
UPnPDeviceDirectory *discovery;
public:
UpnpDatabase():Database(upnp_db_plugin) {}
explicit UpnpDatabase(EventLoop &_event_loop)
:Database(upnp_db_plugin),
event_loop(_event_loop) {}
static Database *Create(EventLoop &main_event_loop,
EventLoop &io_event_loop,
@@ -140,11 +143,11 @@ private:
};
Database *
UpnpDatabase::Create(EventLoop &, EventLoop &,
UpnpDatabase::Create(EventLoop &, EventLoop &io_event_loop,
gcc_unused DatabaseListener &listener,
const ConfigBlock &)
{
return new UpnpDatabase();
return new UpnpDatabase(io_event_loop);
}
void
@@ -152,7 +155,7 @@ UpnpDatabase::Open()
{
UpnpClientGlobalInit(handle);
discovery = new UPnPDeviceDirectory(handle);
discovery = new UPnPDeviceDirectory(event_loop, handle);
try {
discovery->Start();
} catch (...) {