diff options
author | Max Kellermann <max@duempel.org> | 2014-01-26 15:41:25 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2014-01-26 15:43:23 +0100 |
commit | d7e78059b02c79ba59eb4a687496a64060246a30 (patch) | |
tree | 8210ff1677c47dba1a1595ee6e0b63407c983cf4 /src/lib/upnp/upnpplib.hxx | |
parent | 01f7abfc6385884251cc57fa615a065f82d274df (diff) | |
download | mpd-d7e78059b02c79ba59eb4a687496a64060246a30.tar.gz mpd-d7e78059b02c79ba59eb4a687496a64060246a30.tar.xz mpd-d7e78059b02c79ba59eb4a687496a64060246a30.zip |
upnp: initialize the client handle only once
Eliminate class LibUPnP and move the code to ClientInit.cxx. Its
initialization function can be called multiple times, but
UpnpRegisterClient() is called at most once.
Diffstat (limited to '')
-rw-r--r-- | src/lib/upnp/ClientInit.hxx (renamed from src/lib/upnp/upnpplib.hxx) | 42 |
1 files changed, 9 insertions, 33 deletions
diff --git a/src/lib/upnp/upnpplib.hxx b/src/lib/upnp/ClientInit.hxx index cd1762ec4..645e64ca6 100644 --- a/src/lib/upnp/upnpplib.hxx +++ b/src/lib/upnp/ClientInit.hxx @@ -17,43 +17,19 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef _LIBUPNP_H_X_INCLUDED_ -#define _LIBUPNP_H_X_INCLUDED_ +#ifndef MPD_UPNP_CLIENT_INIT_HXX +#define MPD_UPNP_CLIENT_INIT_HXX -#include "util/Error.hxx" +#include "check.h" #include <upnp/upnp.h> -/** Our link to libupnp. Initialize and keep the handle around */ -class LibUPnP { - Error init_error; - UpnpClient_Handle m_clh; +class Error; - static int o_callback(Upnp_EventType, void *, void *); +bool +UpnpClientGlobalInit(UpnpClient_Handle &handle, Error &error); -public: - LibUPnP(); +void +UpnpClientGlobalFinish(); - LibUPnP(const LibUPnP &) = delete; - LibUPnP &operator=(const LibUPnP &) = delete; - - ~LibUPnP(); - - /** Check state after initialization */ - bool ok() const - { - return !init_error.IsDefined(); - } - - /** Retrieve init error if state not ok */ - const Error &GetInitError() const { - return init_error; - } - - UpnpClient_Handle getclh() - { - return m_clh; - } -}; - -#endif /* _LIBUPNP.H_X_INCLUDED_ */ +#endif |