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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
b4becbcc
Commit
b4becbcc
authored
10 years ago
by
Tristan Matthews
Browse files
Options
Downloads
Patches
Plain Diff
sflphone_api: use static instead of anon. namespace
Refs #48032
parent
9f3cc70d
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
-19
17 additions, 19 deletions
daemon/src/sflphone_api.cpp
with
17 additions
and
19 deletions
daemon/src/sflphone_api.cpp
+
17
−
19
View file @
b4becbcc
...
@@ -51,37 +51,35 @@
...
@@ -51,37 +51,35 @@
#include
"client/videomanager.h"
#include
"client/videomanager.h"
#endif // SFL_VIDEO
#endif // SFL_VIDEO
namespace
{
// This manager pointer is only set after proper library initialization.
// This manager pointer is only set after proper library initialization.
ManagerImpl
*
_manager
=
nullptr
;
static
ManagerImpl
*
_manager
=
nullptr
;
CallManager
*
_getCallManager
()
static
CallManager
*
_getCallManager
()
{
{
return
_manager
->
getClient
()
->
getCallManager
();
return
_manager
->
getClient
()
->
getCallManager
();
}
}
ConfigurationManager
*
_getConfigurationManager
()
static
ConfigurationManager
*
_getConfigurationManager
()
{
{
return
_manager
->
getClient
()
->
getConfigurationManager
();
return
_manager
->
getClient
()
->
getConfigurationManager
();
}
}
#ifdef SFL_PRESENCE
#ifdef SFL_PRESENCE
PresenceManager
*
_getPresenceManager
()
static
PresenceManager
*
_getPresenceManager
()
{
{
return
_manager
->
getClient
()
->
getPresenceManager
();
return
_manager
->
getClient
()
->
getPresenceManager
();
}
}
#endif // SFL_PRESENCE
#endif // SFL_PRESENCE
#ifdef SFL_VIDEO
#ifdef SFL_VIDEO
VideoManager
*
_getVideoManager
()
static
VideoManager
*
_getVideoManager
()
{
{
return
_manager
->
getClient
()
->
getVideoManager
();
return
_manager
->
getClient
()
->
getVideoManager
();
}
}
#endif // SFL_VIDEO
#endif // SFL_VIDEO
// User handlers of library events
// User handlers of library events
struct
sflph_ev_handlers
_evHandlers
;
static
sflph_ev_handlers
_evHandlers
;
}
const
char
*
const
char
*
sflph_version
()
sflph_version
()
...
@@ -89,7 +87,7 @@ sflph_version()
...
@@ -89,7 +87,7 @@ sflph_version()
return
PACKAGE_VERSION
;
return
PACKAGE_VERSION
;
}
}
int
sflph_init
(
struct
sflph_ev_handlers
*
ev_handlers
,
enum
sflph_init_flag
flags
)
int
sflph_init
(
sflph_ev_handlers
*
ev_handlers
,
enum
sflph_init_flag
flags
)
{
{
// Ignore initialization if already done
// Ignore initialization if already done
if
(
_manager
)
{
if
(
_manager
)
{
...
...
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