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 'src/lib/upnp/upnpplib.hxx')
-rw-r--r-- | src/lib/upnp/upnpplib.hxx | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/src/lib/upnp/upnpplib.hxx b/src/lib/upnp/upnpplib.hxx deleted file mode 100644 index cd1762ec4..000000000 --- a/src/lib/upnp/upnpplib.hxx +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2003-2014 The Music Player Daemon Project - * http://www.musicpd.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef _LIBUPNP_H_X_INCLUDED_ -#define _LIBUPNP_H_X_INCLUDED_ - -#include "util/Error.hxx" - -#include <upnp/upnp.h> - -/** Our link to libupnp. Initialize and keep the handle around */ -class LibUPnP { - Error init_error; - UpnpClient_Handle m_clh; - - static int o_callback(Upnp_EventType, void *, void *); - -public: - LibUPnP(); - - 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_ */ |