diff options
| author | Max Kellermann <max@duempel.org> | 2014-01-26 15:22:33 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-01-26 15:22:33 +0100 |
| commit | e57e89b9d59faed31abcd11453fb33af95c55f40 (patch) | |
| tree | 59c337eb3c1fe6217c96210d92f35b383c230ce7 | |
| parent | bcc1f933702770c276e7353d71cb0c5fff75bc4a (diff) | |
| download | mpd-e57e89b9d59faed31abcd11453fb33af95c55f40.tar.gz mpd-e57e89b9d59faed31abcd11453fb33af95c55f40.tar.xz mpd-e57e89b9d59faed31abcd11453fb33af95c55f40.zip | |
upnp/discovery: use a plain UpnpClient_Handle instead of class LibUPnP
| -rw-r--r-- | src/db/plugins/UpnpDatabasePlugin.cxx | 2 | ||||
| -rw-r--r-- | src/lib/upnp/Discovery.cxx | 9 | ||||
| -rw-r--r-- | src/lib/upnp/Discovery.hxx | 5 |
3 files changed, 7 insertions, 9 deletions
diff --git a/src/db/plugins/UpnpDatabasePlugin.cxx b/src/db/plugins/UpnpDatabasePlugin.cxx index 8861359ce..ac2055f7d 100644 --- a/src/db/plugins/UpnpDatabasePlugin.cxx +++ b/src/db/plugins/UpnpDatabasePlugin.cxx @@ -182,7 +182,7 @@ UpnpDatabase::Open(Error &error) return false; } - discovery = new UPnPDeviceDirectory(lib); + discovery = new UPnPDeviceDirectory(lib->getclh()); if (!discovery->Start(error)) { delete discovery; delete lib; diff --git a/src/lib/upnp/Discovery.cxx b/src/lib/upnp/Discovery.cxx index ce512bdde..9ea78c624 100644 --- a/src/lib/upnp/Discovery.cxx +++ b/src/lib/upnp/Discovery.cxx @@ -21,7 +21,6 @@ #include "Discovery.hxx" #include "Domain.hxx" #include "ContentDirectoryService.hxx" -#include "upnpplib.hxx" #include "system/Clock.hxx" #include "Log.hxx" @@ -232,9 +231,9 @@ UPnPDeviceDirectory::expireDevices(Error &error) return true; } -UPnPDeviceDirectory::UPnPDeviceDirectory(LibUPnP *_lib, +UPnPDeviceDirectory::UPnPDeviceDirectory(UpnpClient_Handle _handle, UPnPDiscoveryListener *_listener) - :lib(_lib), + :handle(_handle), listener(_listener), discoveredQueue("DiscoveredQueue"), m_searchTimeout(2), m_lastSearch(0) @@ -266,7 +265,7 @@ UPnPDeviceDirectory::search(Error &error) m_lastSearch = now; // We search both for device and service just in case. - int code = UpnpSearchAsync(lib->getclh(), m_searchTimeout, + int code = UpnpSearchAsync(handle, m_searchTimeout, ContentDirectorySType, GetUpnpCookie()); if (code != UPNP_E_SUCCESS) { error.Format(upnp_domain, code, @@ -275,7 +274,7 @@ UPnPDeviceDirectory::search(Error &error) return false; } - code = UpnpSearchAsync(lib->getclh(), m_searchTimeout, + code = UpnpSearchAsync(handle, m_searchTimeout, MediaServerDType, GetUpnpCookie()); if (code != UPNP_E_SUCCESS) { error.Format(upnp_domain, code, diff --git a/src/lib/upnp/Discovery.hxx b/src/lib/upnp/Discovery.hxx index 1a126edfd..af07daf61 100644 --- a/src/lib/upnp/Discovery.hxx +++ b/src/lib/upnp/Discovery.hxx @@ -32,7 +32,6 @@ #include <vector> #include <string> -class LibUPnP; class ContentDirectoryService; class UPnPDiscoveryListener { @@ -92,7 +91,7 @@ class UPnPDeviceDirectory final : UpnpCallback { } }; - LibUPnP *const lib; + const UpnpClient_Handle handle; UPnPDiscoveryListener *const listener; Mutex mutex; @@ -112,7 +111,7 @@ class UPnPDeviceDirectory final : UpnpCallback { unsigned m_lastSearch; public: - UPnPDeviceDirectory(LibUPnP *_lib, + UPnPDeviceDirectory(UpnpClient_Handle _handle, UPnPDiscoveryListener *_listener=nullptr); ~UPnPDeviceDirectory(); |