Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
2be75dcc
Commit
2be75dcc
authored
Sep 11, 2013
by
Tristan Matthews
Browse files
* #29917: manager: remove inline methods
parent
9de714b3
Changes
3
Hide whitespace changes
Inline
Side-by-side
daemon/src/audio/mainbuffer.cpp
View file @
2be75dcc
...
...
@@ -395,6 +395,7 @@ void MainBuffer::flushAllBuffers()
void
MainBuffer
::
dumpInfo
()
{
#if 0
sfl::ScopedLock guard(mutex_);
// print each call and bound call ids
...
...
@@ -435,4 +436,5 @@ void MainBuffer::dumpInfo()
DEBUG("%s", dbg_str.c_str());
}
#endif
}
daemon/src/managerimpl.cpp
View file @
2be75dcc
...
...
@@ -2996,3 +2996,24 @@ ManagerImpl::getAudioDriver()
{
return
audiodriver_
;
}
MainBuffer
&
ManagerImpl
::
getMainBuffer
()
{
return
mainBuffer_
;
}
Client
*
ManagerImpl
::
getClient
()
{
return
&
client_
;
}
#ifdef SFL_VIDEO
VideoControls
*
ManagerImpl
::
getVideoControls
()
{
return
client_
.
getVideoControls
();
}
#endif
daemon/src/managerimpl.h
View file @
2be75dcc
...
...
@@ -938,9 +938,7 @@ class ManagerImpl {
/**
* Return a pointer to the instance of the mainbuffer
*/
MainBuffer
&
getMainBuffer
()
{
return
mainBuffer_
;
}
MainBuffer
&
getMainBuffer
();
/**
* Tell if there is a current call processed
...
...
@@ -952,13 +950,9 @@ class ManagerImpl {
* Return the current Client
* @return A pointer to the Client instance
*/
Client
*
getClient
()
{
return
&
client_
;
}
Client
*
getClient
();
#ifdef SFL_VIDEO
VideoControls
*
getVideoControls
()
{
return
client_
.
getVideoControls
();
}
VideoControls
*
getVideoControls
();
#endif
/**
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment