From ed4b639e15b21058a8d0febe5266a91ca4f1aad8 Mon Sep 17 00:00:00 2001
From: Alexandre Lision <alexandre.lision@gmail.com>
Date: Sun, 15 Mar 2015 18:06:53 -0400
Subject: [PATCH] qtwrapper: adapt to daemon API
Refs #68589
---
src/qtwrapper/instancemanager.cpp | 31 ++++++++++++-------------------
1 file changed, 12 insertions(+), 19 deletions(-)
diff --git a/src/qtwrapper/instancemanager.cpp b/src/qtwrapper/instancemanager.cpp
index f6c46610..61232c4c 100644
--- a/src/qtwrapper/instancemanager.cpp
+++ b/src/qtwrapper/instancemanager.cpp
@@ -50,26 +50,19 @@ InstanceInterface::InstanceInterface() : m_pTimer(nullptr)
ringFlags |= DRing::DRING_FLAG_DEBUG;
ringFlags |= DRing::DRING_FLAG_CONSOLE_LOG;
- const std::map<DRing::EventHandlerKey, std::map<std::string, std::shared_ptr<DRing::CallbackWrapperBase>>> evHandlers = {
- { // 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(static_cast<DRing::InitFlag>(ringFlags));
- 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()
@@ -79,7 +72,7 @@ InstanceInterface::~InstanceInterface()
void pollEvents()
{
- DRing::poll_events();
+ DRing::pollEvents();
}
bool InstanceInterface::isConnected()
--
GitLab