Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-libclient
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-libclient
Commits
ed4b639e
Commit
ed4b639e
authored
10 years ago
by
Alexandre Lision
Committed by
Alexandre Lision
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
qtwrapper: adapt to daemon API
Refs #68589
parent
7c0af2d2
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/qtwrapper/instancemanager.cpp
+12
-19
12 additions, 19 deletions
src/qtwrapper/instancemanager.cpp
with
12 additions
and
19 deletions
src/qtwrapper/instancemanager.cpp
+
12
−
19
View file @
ed4b639e
...
...
@@ -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
_e
vents
();
DRing
::
poll
E
vents
();
}
bool
InstanceInterface
::
isConnected
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment