upnp: add class UpnpCallback

Each Upnp*Async() call passes a new cookie pointer, and the cookie
passed to UpnpRegisterClient() appears to be ignored.  Using this
interface is a more elegant approach than having one single "handler"
function.

1 files changed, 0 insertions, 11 deletions

diff --git a/src/lib/upnp/upnpplib.hxx b/src/lib/upnp/upnpplib.hxx
index 6759aa16d..cd1762ec4 100644
--- a/src/lib/upnp/upnpplib.hxx
+++ b/src/lib/upnp/upnpplib.hxx
@@ -24,17 +24,11 @@
 
 #include <upnp/upnp.h>
 
-#include <functional>
-
 /** Our link to libupnp. Initialize and keep the handle around */
 class LibUPnP {
-	typedef std::function<void(Upnp_EventType type, void *event)> Handler;
-
 	Error init_error;
 	UpnpClient_Handle m_clh;
 
-	Handler handler;
-
 	static int o_callback(Upnp_EventType, void *, void *);
 
 public:
@@ -56,11 +50,6 @@ public:
 		return init_error;
 	}
 
-	template<typename T>
-	void SetHandler(T &&_handler) {
-		handler = std::forward<T>(_handler);
-	}
-
 	UpnpClient_Handle getclh()
 	{
 		return m_clh;