jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

[#2006] Dragndrop fully functional with INCOMING and HOLD call

Browse Source
This commit is contained in:
Alexandre Savard
2009-08-24 13:09:40 -04:00
parent c15bd15bd3
commit e6e1b337e7
1 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
sflphone-common/src/managerimpl.cpp
View File

@ -493,16 +493,18 @@ ManagerImpl::offHoldCall (const CallID& id)
AccountID accountid;
bool returnValue, rec;
std::string codecName;
CallID call_id;
CallID call_id, current_call_id;
stopTone (false);
call_id = id;
current_call_id = getCurrentCallId();
//Place current call on hold if it isn't
if (hasCurrentCall() ) {
if (hasCurrentCall() && !participToConference(current_call_id))
{
_debug ("Put the current call (ID=%s) on hold\n", getCurrentCallId().c_str());
onHoldCall (getCurrentCallId());
onHoldCall (current_call_id);
}
switchCall(id);
@ -759,16 +761,37 @@ ManagerImpl::joinParticipant(const CallID& call_id1, const CallID& call_id2)
if(iter == _conferencemap.end())
{
_debug("NO CONFERENCE YET, CREATE ONE\n");
// createConference(call_id1, call_id2);
createConference(call_id1, call_id2);
// answerCall(call_id);
call_details = getCallDetails(call_id1);
std::map<std::string, std::string>::iterator iter = call_details.find("CALL_STATE");
_debug(" call %s state: %s\n", call_id1.c_str(), iter->second.c_str());
if (iter->second == "HOLD")
{
_debug(" OFFHOLD %s\n", call_id1.c_str());
offHoldCall(call_id1);
}
else if(iter->second == "INCOMING")
{
_debug(" INCOMING %s\n", call_id1.c_str());
answerCall(call_id1);
}
call_details = getCallDetails(call_id2);
iter = call_details.find("CALL_STATE");
_debug(" call %s state: %s\n", call_id2.c_str(), iter->second.c_str());
if (iter->second == "HOLD")
{
_debug(" OFFHOLD %s\n", call_id2.c_str());
offHoldCall (call_id2);
}
else if(iter->second == "INCOMING")
{
_debug(" INCOMING %s\n", call_id2.c_str());
answerCall(call_id2);
}