From e57e89b9d59faed31abcd11453fb33af95c55f40 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sun, 26 Jan 2014 15:22:33 +0100
Subject: upnp/discovery: use a plain UpnpClient_Handle instead of class
 LibUPnP

---
 src/lib/upnp/Discovery.cxx | 9 ++++-----
 src/lib/upnp/Discovery.hxx | 5 ++---
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'src/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();
 
-- 
cgit v1.2.3