From 9e242c12dddd31616e71d6e6620c75e5bae545ec Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandre.savard@savoirfairelinux.net>
Date: Thu, 19 Mar 2009 09:20:34 -0400
Subject: [PATCH] Fixed call state INCOMING when receiving a call
---
src/managerimpl.cpp | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/src/managerimpl.cpp b/src/managerimpl.cpp
index 9315572eb8..fb7fd32d28 100644
--- a/src/managerimpl.cpp
+++ b/src/managerimpl.cpp
@@ -445,9 +445,9 @@ ManagerImpl::offHoldCall(const CallID& id)
switchCall(id);
- // codecName = getCurrentCodecName(id);
+ codecName = getCurrentCodecName(id);
// _debug("ManagerImpl::hangupCall(): broadcast codec name %s \n",codecName.c_str());
- // if (_dbus) _dbus->getCallManager()->currentSelectedCodec(id,codecName.c_str());
+ if (_dbus) _dbus->getCallManager()->currentSelectedCodec(id,codecName.c_str());
return returnValue;
}
@@ -739,7 +739,9 @@ ManagerImpl::incomingCall(Call* call, const AccountID& accountId)
*/
/* Broadcast a signal over DBus */
- _dbus->getCallManager()->incomingCall(accountId, call->getCallId(), from);
+ if (_dbus) _dbus->getCallManager()->incomingCall(accountId, call->getCallId(), from);
+
+ if (_dbus) _dbus->getCallManager()->callStateChanged(call->getCallId(), "INCOMING");
// Reduce volume of the other pulseaudio-connected audio applications
if( _audiodriver->getLayerType() == PULSEAUDIO && getConfigInt( PREFERENCES , CONFIG_PA_VOLUME_CTRL ) ) {
@@ -780,14 +782,13 @@ ManagerImpl::peerRingingCall(const CallID& id)
if (isCurrentCall(id)) {
ringback();
}
- if (_dbus) _dbus->getCallManager()->callStateChanged(id, "RINGING");
+ // if (_dbus) _dbus->getCallManager()->callStateChanged(id, "RINGING");
}
//THREAD=VoIP Call=Outgoing/Ingoing
void
ManagerImpl::peerHungupCall(const CallID& id)
{
- _debug("ManagerImpl::peerHungupCall():this function is called when peer hangup \n");
PulseLayer *pulselayer;
AccountID accountid;
bool returnValue;
@@ -977,15 +978,12 @@ ManagerImpl::ringtone()
{
//TODO Comment this because it makes the daemon crashes since the main thread
//synchronizes the ringtone thread.
- _debug("RINGING!!! 1\n");
ringchoice = getConfigString(AUDIO, RING_CHOICE);
//if there is no / inside the path
if ( ringchoice.find(DIR_SEPARATOR_CH) == std::string::npos ) {
// check inside global share directory
ringchoice = std::string(PROGSHAREDIR) + DIR_SEPARATOR_STR + RINGDIR + DIR_SEPARATOR_STR + ringchoice;
-
- _debug("RINGING!!! 2\n");
}
audiolayer = getAudioDriver();
@@ -993,7 +991,6 @@ ManagerImpl::ringtone()
if (audiolayer == 0)
return;
- _debug("RINGING!!! 3\n");
samplerate = audiolayer->getSampleRate();
codecForTone = _codecDescriptorMap.getFirstCodecAvailable();
@@ -1004,7 +1001,6 @@ ManagerImpl::ringtone()
if (loadFile) {
- _debug("RINGING!!! 5\n");
_toneMutex.enterMutex();
_audiofile.start();
_toneMutex.leaveMutex();
@@ -1014,18 +1010,15 @@ ManagerImpl::ringtone()
}
else{
audiolayer->startStream();
- _debug("RINGING!!! 6\n");
}
} else {
ringback();
- _debug("RINGING!!! 7\n");
}
}
else
{
ringback();
- _debug("RINGING!!! 8\n");
}
}
--
GitLab