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

lib/upnp/ClientInit: return UpnpClient_Handle

Browse Source
This commit is contained in:
Max Kellermann 2018-01-02 12:22:44 +01:00
parent 46406d6cca
commit 1fd8d46064
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,7 +153,7 @@ UpnpDatabase::Create(EventLoop &, EventLoop &io_event_loop,
void void
UpnpDatabase::Open() UpnpDatabase::Open()
{ {
UpnpClientGlobalInit(handle); handle = UpnpClientGlobalInit();
discovery = new UPnPDeviceDirectory(event_loop, handle); discovery = new UPnPDeviceDirectory(event_loop, handle);
try { try {

6
src/lib/upnp/ClientInit.cxx
View File

@ -60,8 +60,8 @@ DoInit()
UpnpGetErrorMessage(code)); UpnpGetErrorMessage(code));
} }
void UpnpClient_Handle
UpnpClientGlobalInit(UpnpClient_Handle &handle) UpnpClientGlobalInit()
{ {
UpnpGlobalInit(); UpnpGlobalInit();
@ -75,7 +75,7 @@ UpnpClientGlobalInit(UpnpClient_Handle &handle)
} }
++upnp_client_ref; ++upnp_client_ref;
handle = upnp_client_handle; return upnp_client_handle;
} }
void void

4
src/lib/upnp/ClientInit.hxx
View File

@ -24,8 +24,8 @@
#include <upnp.h> #include <upnp.h>
void UpnpClient_Handle
UpnpClientGlobalInit(UpnpClient_Handle &handle); UpnpClientGlobalInit();
void void
UpnpClientGlobalFinish() noexcept; UpnpClientGlobalFinish() noexcept;

3
src/neighbor/plugins/UpnpNeighborPlugin.cxx
View File

@ -76,8 +76,7 @@ private:
void void
UpnpNeighborExplorer::Open() UpnpNeighborExplorer::Open()
{ {
UpnpClient_Handle handle; auto handle = UpnpClientGlobalInit();
UpnpClientGlobalInit(handle);
discovery = new UPnPDeviceDirectory(event_loop, handle, this); discovery = new UPnPDeviceDirectory(event_loop, handle, this);