aboutsummaryrefslogtreecommitdiffstats
path: root/src/db/upnp/upnpplib.hxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-01-16 09:06:01 +0100
committerMax Kellermann <max@duempel.org>2014-01-16 09:30:24 +0100
commita35c7bc81aec11e9720462d8258a0d3c41e2fac7 (patch)
treef9601aa14c2c12fcfa183d8da248c04f8f55a915 /src/db/upnp/upnpplib.hxx
parent02769929b31479bffa3e42c101a9bb192c07976f (diff)
downloadmpd-a35c7bc81aec11e9720462d8258a0d3c41e2fac7.tar.gz
mpd-a35c7bc81aec11e9720462d8258a0d3c41e2fac7.tar.xz
mpd-a35c7bc81aec11e9720462d8258a0d3c41e2fac7.zip
db/upnp: move the LibUPnP instance to class UpnpDatabase
Delete the object when closing the database.
Diffstat (limited to '')
-rw-r--r--src/db/upnp/upnpplib.hxx9
1 files changed, 3 insertions, 6 deletions
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
{