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
1ad7e284
Commit
1ad7e284
authored
May 25, 2011
by
Alexandre Savard
Browse files
Options
Downloads
Patches
Plain Diff
#5921: Fix no audio after holding a conference
parent
22c277bc
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
sflphone-common/src/managerimpl.cpp
+46
-48
46 additions, 48 deletions
sflphone-common/src/managerimpl.cpp
with
46 additions
and
48 deletions
sflphone-common/src/managerimpl.cpp
+
46
−
48
View file @
1ad7e284
...
...
@@ -625,77 +625,75 @@ bool ManagerImpl::onHoldCall (const CallID& callId)
}
//THREAD=Main
bool
ManagerImpl
::
offHoldCall
(
const
CallID
&
call
_i
d
)
bool
ManagerImpl
::
offHoldCall
(
const
CallID
&
call
I
d
)
{
AccountID
account
_i
d
;
AccountID
account
I
d
;
bool
returnValue
,
isRec
;
std
::
string
codecName
;
isRec
=
false
;
_debug
(
"Manager: Put call %s off hold"
,
call
_i
d
.
c_str
());
_debug
(
"Manager: Put call %s off hold"
,
call
I
d
.
c_str
());
stopTone
();
CallID
current
_c
all
_i
d
=
getCurrentCallId
();
CallID
current
C
all
I
d
=
getCurrentCallId
();
//Place current call on hold if it isn't
if
(
hasCurrentCall
())
{
// if this is not a conference and this and is not a conference participant
if
(
!
isConference
(
current
_c
all
_i
d
)
&&
!
participToConference
(
current
_c
all
_i
d
))
{
_debug
(
"Manager: Has current call (%s), put on hold"
,
current
_c
all
_i
d
.
c_str
());
onHoldCall
(
current
_c
all
_i
d
);
}
else
if
(
isConference
(
current
_c
all
_i
d
)
&&
!
participToConference
(
call
_i
d
))
{
detachParticipant
(
default_id
,
current
_c
all
_i
d
);
if
(
!
isConference
(
current
C
all
I
d
)
&&
!
participToConference
(
current
C
all
I
d
))
{
_debug
(
"Manager: Has current call (%s), put on hold"
,
current
C
all
I
d
.
c_str
());
onHoldCall
(
current
C
all
I
d
);
}
else
if
(
isConference
(
current
C
all
I
d
)
&&
!
participToConference
(
call
I
d
))
{
detachParticipant
(
default_id
,
current
C
all
I
d
);
}
}
/* Direct IP to IP call */
if
(
getConfigFromCall
(
call
_i
d
)
==
Call
::
IPtoIP
)
{
if
(
getConfigFromCall
(
call
I
d
)
==
Call
::
IPtoIP
)
{
// is_rec = SIPVoIPLink::instance (AccountNULL)-> isRecording (call_id);
returnValue
=
SIPVoIPLink
::
instance
(
AccountNULL
)
->
offhold
(
call
_i
d
);
returnValue
=
SIPVoIPLink
::
instance
(
AccountNULL
)
->
offhold
(
call
I
d
);
}
/* Classic call, attached to an account */
else
{
account
_i
d
=
getAccountFromCall
(
call
_i
d
);
account
I
d
=
getAccountFromCall
(
call
I
d
);
_debug
(
"Manager: Setting offhold, Account %s, callid %s"
,
account
_i
d
.
c_str
(),
call
_i
d
.
c_str
());
_debug
(
"Manager: Setting offhold, Account %s, callid %s"
,
account
I
d
.
c_str
(),
call
I
d
.
c_str
());
isRec
=
getAccountLink
(
account_id
)
->
getCall
(
call_id
)
->
isRecording
();
returnValue
=
getAccountLink
(
account_id
)
->
offhold
(
call_id
);
isRec
=
getAccountLink
(
accountId
)
->
getCall
(
callId
)
->
isRecording
();
returnValue
=
getAccountLink
(
accountId
)
->
offhold
(
callId
);
}
if
(
_dbus
==
NULL
)
{
_error
(
"Manager: Error: DBUS not initialized"
);
}
if
(
_dbus
)
{
if
(
isRec
)
{
_dbus
->
getCallManager
()
->
callStateChanged
(
call
_i
d
,
"UNHOLD_RECORD"
);
_dbus
->
getCallManager
()
->
callStateChanged
(
call
I
d
,
"UNHOLD_RECORD"
);
}
else
{
_dbus
->
getCallManager
()
->
callStateChanged
(
call_id
,
"UNHOLD_CURRENT"
);
}
_dbus
->
getCallManager
()
->
callStateChanged
(
callId
,
"UNHOLD_CURRENT"
);
}
if
(
participToConference
(
call
_i
d
))
{
if
(
participToConference
(
call
I
d
))
{
AccountID
currentAccountId
;
Call
*
call
=
NULL
;
currentAccountId
=
getAccountFromCall
(
call
_i
d
);
call
=
getAccountLink
(
currentAccountId
)
->
getCall
(
call
_i
d
);
currentAccountId
=
getAccountFromCall
(
call
I
d
);
call
=
getAccountLink
(
currentAccountId
)
->
getCall
(
call
I
d
);
switchCall
(
call
->
getConfId
());
}
else
{
switchCall
(
call_id
);
// audioLayerMutexLock();
// _audiodriver->flushMain();
// audioLayerMutexUnlock();
addStream
(
call_id
);
switchCall
(
callId
);
}
addStream
(
callId
);
getMainBuffer
()
->
stateInfo
();
return
returnValue
;
...
...
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