diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2017-08-06 13:34:44 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2017-08-06 13:34:44 +0100 |
| commit | 661856d0e138e5f1bc6809341b66e69eff903b1b (patch) | |
| tree | 7fbf3491052ad94ed64fd49f9a14f19a9928cb54 /p2pvr/carddaemon/carddaemon.cpp | |
| parent | Drop out local file hanlde for AdHoc's (diff) | |
| download | p2pvr-661856d0e138e5f1bc6809341b66e69eff903b1b.tar.bz2 p2pvr-661856d0e138e5f1bc6809341b66e69eff903b1b.tar.xz p2pvr-661856d0e138e5f1bc6809341b66e69eff903b1b.zip | |
Unify local/global devices and tuners into a single coherent service
Diffstat (limited to 'p2pvr/carddaemon/carddaemon.cpp')
| -rw-r--r-- | p2pvr/carddaemon/carddaemon.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/p2pvr/carddaemon/carddaemon.cpp b/p2pvr/carddaemon/carddaemon.cpp index f7889e8..c20ca4e 100644 --- a/p2pvr/carddaemon/carddaemon.cpp +++ b/p2pvr/carddaemon/carddaemon.cpp @@ -1,5 +1,5 @@ #include <icetrayService.h> -#include "localDevices.h" +#include "devices.h" #include <Ice/ObjectAdapter.h> #include <Ice/Communicator.h> #include <IceUtil/Timer.h> @@ -9,8 +9,7 @@ class CardDaemon : public IceTray::Service { public: 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 LocalDevicesI(adapter, timer), ic->stringToIdentity("Devices")); + adapter->add(new DevicesI(), ic->stringToIdentity("Devices")); } }; |