From e3ee8ce2de231796e5423a81520068d61625e4f5 Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandresavard@alexandresavard-desktop.(none)>
Date: Fri, 2 Apr 2010 17:11:46 -0400
Subject: [PATCH] [#2926] Fix warnings (manager, sipvoiplink)
---
sflphone-common/src/managerimpl.cpp | 36 +------------------------
sflphone-common/src/sip/sipvoiplink.cpp | 1 -
2 files changed, 1 insertion(+), 36 deletions(-)
diff --git a/sflphone-common/src/managerimpl.cpp b/sflphone-common/src/managerimpl.cpp
index b994f4b02f..9b28e568e1 100644
--- a/sflphone-common/src/managerimpl.cpp
+++ b/sflphone-common/src/managerimpl.cpp
@@ -182,38 +182,6 @@ void ManagerImpl::switchCall (const CallID& id) {
ost::MutexLock m(_currentCallMutex);
_debug ("----- Switch current call id to %s -----", id.c_str());
_currentCallId2 = id;
-
- /*
- AudioLayer *al = getAudioDriver();
-
- if (id != "") {
-
- if(isConference(id)) {
-
- Conference *conf;
-
- ConferenceMap::iterator iter = _conferencemap.find(id);
- if(iter != _conferencemap.end())
- {
- _debug(" set call recordable in audio layer");
- conf = iter->second;
- al->setRecorderInstance((Recordable*)conf);
- }
- }
- else {
-
- // set the recordable instance in audiolayer
- AccountID account_id = getAccountFromCall(id);
-
-
- Call *call = NULL;
- call = getAccountLink (account_id)->getCall(id);
-
- _debug(" set call recordable in audio layer");
- al->setRecorderInstance((Recordable*)call);
- }
- }
- */
}
///////////////////////////////////////////////////////////////////////////////
@@ -3218,7 +3186,7 @@ std::map<std::string, std::string> ManagerImpl::getAccountDetails (
a.insert(std::pair<std::string, std::string>(ACCOUNT_DTMF_TYPE, getConfigString(
accountID, ACCOUNT_DTMF_TYPE)));
- RegistrationState state;
+ RegistrationState state = Unregistered;
std::string registrationStateCode;
std::string registrationStateDescription;
@@ -3235,8 +3203,6 @@ std::map<std::string, std::string> ManagerImpl::getAccountDetails (
registrationStateDescription
= account->getRegistrationStateDetailed().second;
}
- } else {
- state = Unregistered;
}
(accountID == IP2IP_PROFILE) ? a.insert(
diff --git a/sflphone-common/src/sip/sipvoiplink.cpp b/sflphone-common/src/sip/sipvoiplink.cpp
index 22310598b4..069e26cb41 100644
--- a/sflphone-common/src/sip/sipvoiplink.cpp
+++ b/sflphone-common/src/sip/sipvoiplink.cpp
@@ -2976,7 +2976,6 @@ void call_on_state_changed (pjsip_inv_session *inv, pjsip_event *e)
_debug ("UserAgent: Call state changed to %s", invitationStateMap[inv->state]);
pjsip_rx_data *rdata;
- pj_status_t status = PJ_SUCCESS;
/* Retrieve the call information */
SIPCall * call = NULL;
--
GitLab