Skip to content
Snippets Groups Projects
Commit ed4b639e authored by Alexandre Lision's avatar Alexandre Lision Committed by Alexandre Lision
Browse files

qtwrapper: adapt to daemon API

Refs #68589
parent 7c0af2d2
No related branches found
No related tags found
No related merge requests found
...@@ -50,26 +50,19 @@ InstanceInterface::InstanceInterface() : m_pTimer(nullptr) ...@@ -50,26 +50,19 @@ InstanceInterface::InstanceInterface() : m_pTimer(nullptr)
ringFlags |= DRing::DRING_FLAG_DEBUG; ringFlags |= DRing::DRING_FLAG_DEBUG;
ringFlags |= DRing::DRING_FLAG_CONSOLE_LOG; ringFlags |= DRing::DRING_FLAG_CONSOLE_LOG;
const std::map<DRing::EventHandlerKey, std::map<std::string, std::shared_ptr<DRing::CallbackWrapperBase>>> evHandlers = { DRing::init(static_cast<DRing::InitFlag>(ringFlags));
{ // Call event handlers
DRing::EventHandlerKey::CALL, DBus::CallManager::instance().callHandlers
},
{ // Configuration event handlers
DRing::EventHandlerKey::CONFIG, DBus::ConfigurationManager::instance().confHandlers
},
{ // Presence event handlers
DRing::EventHandlerKey::PRESENCE, DBus::PresenceManager::instance().presHandlers
}
#ifdef ENABLE_VIDEO
,{ // Video event handlers
DRing::EventHandlerKey::VIDEO, DBus::VideoManager::instance().videoHandlers
}
#endif
};
DRing::init(evHandlers, static_cast<DRing::InitFlag>(ringFlags)); registerCallHandlers(DBus::CallManager::instance().callHandlers);
registerConfHandlers(DBus::ConfigurationManager::instance().confHandlers);
registerPresHandlers(DBus::PresenceManager::instance().presHandlers);
#ifdef RING_VIDEO
registerVideoHandlers(DBus::VideoManager::instance().videoHandlers);
#endif
printf("INITIATED DAEMON\n"); if (!DRing::start())
printf("Error initializing daemon\n");
else
printf("Daemon is running\n");
} }
InstanceInterface::~InstanceInterface() InstanceInterface::~InstanceInterface()
...@@ -79,7 +72,7 @@ InstanceInterface::~InstanceInterface() ...@@ -79,7 +72,7 @@ InstanceInterface::~InstanceInterface()
void pollEvents() void pollEvents()
{ {
DRing::poll_events(); DRing::pollEvents();
} }
bool InstanceInterface::isConnected() bool InstanceInterface::isConnected()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment