summaryrefslogtreecommitdiff
path: root/p2pvr/carddaemon/carddaemon.cpp
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2017-07-30 00:15:33 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2017-07-30 00:15:33 +0100
commitadd5644f64c86b635b62d560187c993aa7072b76 (patch)
tree70aaf1ae49ef4f27c4b20809250d5f5d63921d0e /p2pvr/carddaemon/carddaemon.cpp
parentSingle definition of glibmm (diff)
downloadp2pvr-add5644f64c86b635b62d560187c993aa7072b76.tar.bz2
p2pvr-add5644f64c86b635b62d560187c993aa7072b76.tar.xz
p2pvr-add5644f64c86b635b62d560187c993aa7072b76.zip
BIG migration from Project2 based to IceTray/Slicer :D
Diffstat (limited to 'p2pvr/carddaemon/carddaemon.cpp')
-rw-r--r--p2pvr/carddaemon/carddaemon.cpp16
1 files changed, 7 insertions, 9 deletions
diff --git a/p2pvr/carddaemon/carddaemon.cpp b/p2pvr/carddaemon/carddaemon.cpp
index 0b234e5..d48bb0c 100644
--- a/p2pvr/carddaemon/carddaemon.cpp
+++ b/p2pvr/carddaemon/carddaemon.cpp
@@ -1,19 +1,17 @@
-#include <daemonBase.h>
+#include <icetrayService.h>
#include "localDevices.h"
#include <Ice/ObjectAdapter.h>
+#include <Ice/Communicator.h>
+#include <IceUtil/Timer.h>
-class P2PvrCardDaemon : public DaemonBase {
+class P2PvrCardDaemon : public IceTray::Service {
public:
- P2PvrCardDaemon(int argc, char ** argv) :
- DaemonBase(argc, argv)
- {
- }
-
- void addServants(const Ice::ObjectAdapterPtr & adapter, const IceUtil::TimerPtr & timer) const
+ void addObjects(const std::string &, const Ice::CommunicatorPtr & ic, const Ice::StringSeq &, const Ice::ObjectAdapterPtr & adapter) override
{
+ IceUtil::TimerPtr timer = new IceUtil::Timer();
adapter->add(new LocalDevices(adapter, timer), ic->stringToIdentity("Devices"));
}
};
-NAMEDFACTORY("p2pvrcarddaemon", P2PvrCardDaemon, DaemonFactory);
+FACTORY(P2PvrCardDaemon, IceTray::ServiceFactory);