Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
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
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
9b0857c2
Commit
9b0857c2
authored
10 years ago
by
Tristan Matthews
Browse files
Options
Downloads
Patches
Plain Diff
sflphone_api: avoid use of global static variables
Refs: #48032
parent
4176bbcc
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
daemon/src/sflphone_api.cpp
+17
-27
17 additions, 27 deletions
daemon/src/sflphone_api.cpp
with
17 additions
and
27 deletions
daemon/src/sflphone_api.cpp
+
17
−
27
View file @
9b0857c2
...
...
@@ -51,36 +51,30 @@
#include
"client/videomanager.h"
#endif // SFL_VIDEO
// This manager pointer is only set after proper library initialization.
static
ManagerImpl
*
manager_
=
nullptr
;
static
CallManager
*
getCallManager
()
{
return
m
anager
_
->
getClient
()
->
getCallManager
();
return
M
anager
::
instance
().
getClient
()
->
getCallManager
();
}
static
ConfigurationManager
*
getConfigurationManager
()
{
return
m
anager
_
->
getClient
()
->
getConfigurationManager
();
return
M
anager
::
instance
().
getClient
()
->
getConfigurationManager
();
}
#ifdef SFL_PRESENCE
static
PresenceManager
*
getPresenceManager
()
{
return
m
anager
_
->
getClient
()
->
getPresenceManager
();
return
M
anager
::
instance
().
getClient
()
->
getPresenceManager
();
}
#endif // SFL_PRESENCE
#ifdef SFL_VIDEO
static
VideoManager
*
getVideoManager
()
{
return
m
anager
_
->
getClient
()
->
getVideoManager
();
return
M
anager
::
instance
().
getClient
()
->
getVideoManager
();
}
#endif // SFL_VIDEO
// User handlers of library events
static
sflph_ev_handlers
evHandlers_
;
const
char
*
sflph_version
()
{
...
...
@@ -89,10 +83,9 @@ sflph_version()
int
sflph_init
(
sflph_ev_handlers
*
ev_handlers
,
enum
sflph_init_flag
flags
)
{
// Ignore initialization if already done
if
(
manager_
)
{
return
0
;
}
// User handlers of library events
// FIXME: static evil
static
sflph_ev_handlers
evHandlers_
;
// Copy user event handlers
evHandlers_
=
*
ev_handlers
;
...
...
@@ -103,7 +96,11 @@ int sflph_init(sflph_ev_handlers* ev_handlers, enum sflph_init_flag flags)
// Create manager
try
{
manager_
=
&
(
Manager
::
instance
());
// FIXME: static evil
static
ManagerImpl
*
manager
;
// ensure that we haven't been in this function before
assert
(
!
manager
);
manager
=
&
(
Manager
::
instance
());
}
catch
(...)
{
return
-
SFLPH_ERR_MANAGER_INIT
;
}
...
...
@@ -122,9 +119,8 @@ int sflph_init(sflph_ev_handlers* ev_handlers, enum sflph_init_flag flags)
// Initialize manager now
try
{
m
anager
_
->
init
(
""
);
M
anager
::
instance
().
init
(
""
);
}
catch
(...)
{
manager_
=
nullptr
;
return
-
SFLPH_ERR_MANAGER_INIT
;
}
...
...
@@ -133,19 +129,13 @@ int sflph_init(sflph_ev_handlers* ev_handlers, enum sflph_init_flag flags)
void
sflph_fini
(
void
)
{
// Ignore if not yet initialized
if
(
!
manager_
)
{
return
;
}
// Finish manager
manager_
->
finish
();
manager_
=
nullptr
;
Manager
::
instance
().
finish
();
}
void
sflph_poll_events
()
{
m
anager
_
->
pollEvents
();
M
anager
::
instance
().
pollEvents
();
}
bool
sflph_call_place
(
const
std
::
string
&
account_id
,
const
std
::
string
&
call_id
,
const
std
::
string
&
to
)
...
...
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