From a35c7bc81aec11e9720462d8258a0d3c41e2fac7 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 16 Jan 2014 09:06:01 +0100 Subject: db/upnp: move the LibUPnP instance to class UpnpDatabase Delete the object when closing the database. --- src/db/upnp/upnpplib.hxx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/db/upnp/upnpplib.hxx') diff --git a/src/db/upnp/upnpplib.hxx b/src/db/upnp/upnpplib.hxx index c1443624c..6759aa16d 100644 --- a/src/db/upnp/upnpplib.hxx +++ b/src/db/upnp/upnpplib.hxx @@ -35,19 +35,16 @@ class LibUPnP { Handler handler; + static int o_callback(Upnp_EventType, void *, void *); + +public: LibUPnP(); LibUPnP(const LibUPnP &) = delete; LibUPnP &operator=(const LibUPnP &) = delete; - static int o_callback(Upnp_EventType, void *, void *); - -public: ~LibUPnP(); - /** Retrieve the singleton LibUPnP object */ - static LibUPnP *getLibUPnP(Error &error); - /** Check state after initialization */ bool ok() const { -- cgit v1.2.3