oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

zeroconf/Glue: move code to the ZeroconfHelper constructor

Browse Source
This commit is contained in:
Max Kellermann 2021-02-24 14:53:39 +01:00
parent 2d8ecd561b
commit 5f34508aae
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/zeroconf/Glue.cxx
View File

@ -84,13 +84,5 @@ ZeroconfInit(const ConfigData &config, [[maybe_unused]] EventLoop &loop)
} }
} }
#ifdef HAVE_AVAHI return std::make_unique<ZeroconfHelper>(loop, serviceName, listen_port);
return std::make_unique<ZeroconfHelper>(AvahiInit(loop, serviceName,
listen_port));
#endif
#ifdef HAVE_BONJOUR
return std::make_unique<ZeroconfHelper>(BonjourInit(loop, serviceName,
listen_port));
#endif
} }

6
src/zeroconf/Helper.cxx
View File

@ -21,10 +21,16 @@
#ifdef HAVE_AVAHI #ifdef HAVE_AVAHI
#include "avahi/Helper.hxx" #include "avahi/Helper.hxx"
#define CreateHelper AvahiInit
#endif #endif
#ifdef HAVE_BONJOUR #ifdef HAVE_BONJOUR
#include "Bonjour.hxx" #include "Bonjour.hxx"
#define CreateHelper BonjourInit
#endif #endif
ZeroconfHelper::ZeroconfHelper(EventLoop &event_loop, const char *name,
unsigned port)
:helper(CreateHelper(event_loop, name, port)) {}
ZeroconfHelper::~ZeroconfHelper() noexcept = default; ZeroconfHelper::~ZeroconfHelper() noexcept = default;

6
src/zeroconf/Helper.hxx
View File

@ -24,6 +24,7 @@
#include <memory> #include <memory>
class EventLoop;
class AvahiHelper; class AvahiHelper;
class BonjourHelper; class BonjourHelper;
@ -37,9 +38,8 @@ class ZeroconfHelper final {
#endif #endif
public: public:
template<typename T> ZeroconfHelper(EventLoop &event_loop, const char *name,
ZeroconfHelper(T &&_helper) noexcept unsigned port);
:helper(std::forward<T>(_helper)) {}
~ZeroconfHelper() noexcept; ~ZeroconfHelper() noexcept;
}; };