diff options
Diffstat (limited to 'p2pvr/carddaemon/carddaemon.cpp')
| -rw-r--r-- | p2pvr/carddaemon/carddaemon.cpp | 48 |
1 files changed, 6 insertions, 42 deletions
diff --git a/p2pvr/carddaemon/carddaemon.cpp b/p2pvr/carddaemon/carddaemon.cpp index 1ea7e43..a9b9beb 100644 --- a/p2pvr/carddaemon/carddaemon.cpp +++ b/p2pvr/carddaemon/carddaemon.cpp @@ -1,55 +1,19 @@ -#include <daemon.h> -#include <options.h> -#include <logger.h> -#include <Ice/Ice.h> +#include <daemonBase.h> #include "localDevices.h" +#include <Ice/ObjectAdapter.h> -class P2PvrCardDaemon : public Daemon { +class P2PvrCardDaemon : public DaemonBase { public: P2PvrCardDaemon(int argc, char ** argv) : - ic(Ice::initialize(argc, argv)) + DaemonBase(argc, argv) { } - ~P2PvrCardDaemon() + void addServants(const Ice::ObjectAdapterPtr & adapter, const IceUtil::TimerPtr & timer) const { - ic->destroy(); + adapter->add(new LocalDevices(adapter, timer), ic->stringToIdentity("Devices")); } - - void run() const - { - IceUtil::TimerPtr timer = new IceUtil::Timer(); - Logger()->messagebf(LOG_INFO, "Creating adapter (%s, %s)", Adapter, Endpoint); - auto adapter = ic->createObjectAdapterWithEndpoints(Adapter, Endpoint); - P2PVR::LocalDevicesPrx::checkedCast(adapter->add(new LocalDevices(adapter, timer), ic->stringToIdentity(Identity))); - adapter->activate(); - ic->waitForShutdown(); - timer->destroy(); - } - - void shutdown() const - { - ic->shutdown(); - } - INITOPTIONS; - - private: - Ice::CommunicatorPtr ic; - - static std::string Adapter; - static std::string Endpoint; - static std::string Identity; }; -std::string P2PvrCardDaemon::Adapter; -std::string P2PvrCardDaemon::Endpoint; -std::string P2PvrCardDaemon::Identity; - DECLARE_GENERIC_LOADER("p2pvrcarddaemon", DaemonLoader, P2PvrCardDaemon); -DECLARE_OPTIONS(P2PvrCardDaemon, "P2PVR Card Daemon") -("p2pvr.carddaemon.iceadapter", Options::value(&Adapter, "DefaultAdapter"), "ICE Adapter name") -("p2pvr.carddaemon.iceendpoint", Options::value(&Endpoint, "default -p 10001"), "ICE Endpoint address") -("p2pvr.carddaemon.iceidentity", Options::value(&Identity, "Devices"), "ICE Interface identity") -END_OPTIONS(P2PvrCardDaemon); - |