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);