From c501dfe217238aab01a7bacd972fc9c9509afe91 Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
Date: Wed, 14 Jul 2010 14:51:54 -0400
Subject: [PATCH] [#3649] Fix account's codec configuration list save
---
sflphone-common/src/account.cpp | 12 ++++--------
sflphone-common/src/account.h | 5 ++---
sflphone-common/src/dbus/configurationmanager.cpp | 3 +--
sflphone-common/src/iax/iaxaccount.cpp | 4 ++--
sflphone-common/src/sip/sipaccount.cpp | 6 +++---
5 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/sflphone-common/src/account.cpp b/sflphone-common/src/account.cpp
index ca278d3caf..df26904f5b 100644
--- a/sflphone-common/src/account.cpp
+++ b/sflphone-common/src/account.cpp
@@ -39,7 +39,7 @@ Account::Account (const AccountID& accountID, std::string type) :
, _enabled (true)
, _type (type)
, _codecOrder ()
- , _startupCodecStr("")
+ , _codecStr("")
, _displayName("")
, _useragent("SFLphone")
{
@@ -75,7 +75,7 @@ void Account::setRegistrationState (RegistrationState state) {
void Account::loadAudioCodecs (void) {
// if the user never set the codec list, use the default configuration for this account
- if(_startupCodecStr == "") {
+ if(_codecStr == "") {
_info ("Account: use the default order");
Manager::instance ().getCodecDescriptorMap ().setDefaultOrder();
}
@@ -84,7 +84,7 @@ void Account::loadAudioCodecs (void) {
std::vector<std::string> active_list = Manager::instance ().retrieveActiveCodecs();
// This property is now set per account basis
// std::string s = Manager::instance ().getConfigString (_accountID, "ActiveCodecs");
- setActiveCodecs (Manager::instance ().unserialize (_startupCodecStr));
+ setActiveCodecs (Manager::instance ().unserialize (_codecStr));
}
}
@@ -107,10 +107,6 @@ void Account::setActiveCodecs (const std::vector <std::string> &list) {
}
// setConfig
- std::string s = Manager::instance ().serialize (list);
-
- // Set the config per account
- Manager::instance().setConfig (_accountID, "ActiveCodecs", s);
-
+ _codecStr = Manager::instance ().serialize (list);
}
diff --git a/sflphone-common/src/account.h b/sflphone-common/src/account.h
index 4180918cbe..183b6789b1 100644
--- a/sflphone-common/src/account.h
+++ b/sflphone-common/src/account.h
@@ -260,7 +260,6 @@ class Account : public Serializable{
* @return CodecOrder& The list that reflects the user's choice
*/
inline CodecOrder& getActiveCodecs() { return _codecOrder; }
-
void setActiveCodecs (const std::vector <std::string>& list);
inline std::string getDisplayName(void) { return _displayName; }
@@ -341,9 +340,9 @@ class Account : public Serializable{
/**
* List of codec obtained when parsing configuration and used
- * to generate codec order list, should not be used elsewhere.
+ * to generate codec order list
*/
- std::string _startupCodecStr;
+ std::string _codecStr;
// Display Name that can be used in SIP URI.
std::string _displayName;
diff --git a/sflphone-common/src/dbus/configurationmanager.cpp b/sflphone-common/src/dbus/configurationmanager.cpp
index 8c8b0fdca1..6226376896 100755
--- a/sflphone-common/src/dbus/configurationmanager.cpp
+++ b/sflphone-common/src/dbus/configurationmanager.cpp
@@ -374,8 +374,7 @@ std::vector<std::string> ConfigurationManager::getCodecList(void) {
std::vector<std::string> list;
- CodecsMap codecs =
- Manager::instance().getCodecDescriptorMap().getCodecsMap();
+ CodecsMap codecs = Manager::instance().getCodecDescriptorMap().getCodecsMap();
CodecsMap::iterator iter = codecs.begin();
while (iter != codecs.end()) {
diff --git a/sflphone-common/src/iax/iaxaccount.cpp b/sflphone-common/src/iax/iaxaccount.cpp
index 5b75b8dd69..73c04ca0e5 100644
--- a/sflphone-common/src/iax/iaxaccount.cpp
+++ b/sflphone-common/src/iax/iaxaccount.cpp
@@ -62,7 +62,7 @@ void IAXAccount::serialize(Conf::YamlEmitter *emitter)
Conf::ScalarNode type(Account::_type);
Conf::ScalarNode mailbox("97");
- Conf::ScalarNode codecs(_startupCodecStr);
+ Conf::ScalarNode codecs(_codecStr);
Conf::ScalarNode displayName(_displayName);
accountmap.setKeyValue(aliasKey, &alias);
@@ -108,7 +108,7 @@ void IAXAccount::unserialize(Conf::MappingNode *map)
// val = (Conf::ScalarNode *)(map->getValue(mailboxKey));
val = (Conf::ScalarNode *)(map->getValue(codecsKey));
- if(val) { _startupCodecStr = val->getValue(); val = NULL; }
+ if(val) { _codecStr = val->getValue(); val = NULL; }
val = (Conf::ScalarNode *)(map->getValue(displayNameKey));
if(val) { _displayName = val->getValue(); val = NULL; }
diff --git a/sflphone-common/src/sip/sipaccount.cpp b/sflphone-common/src/sip/sipaccount.cpp
index 8549bb95c9..105aedbaf5 100755
--- a/sflphone-common/src/sip/sipaccount.cpp
+++ b/sflphone-common/src/sip/sipaccount.cpp
@@ -180,8 +180,8 @@ void SIPAccount::serialize(Conf::YamlEmitter *emitter) {
std::stringstream publicportstr; publicportstr << _publishedPort;
Conf::ScalarNode publishPort(publicportstr.str());
Conf::ScalarNode sameasLocal(_publishedSameasLocal ? "true" : "false");
- Conf::ScalarNode resolveOnce(_resolveOnce ? "true" : "false");
- Conf::ScalarNode codecs(_startupCodecStr);
+ Conf::ScalarNode resolveOnce(_resolveOnce ? "true" : "false");
+ Conf::ScalarNode codecs(_codecStr);
Conf::ScalarNode stunServer(_stunServer);
Conf::ScalarNode stunEnabled(_stunEnabled ? "true" : "false");
Conf::ScalarNode displayName(_displayName);
@@ -297,7 +297,7 @@ void SIPAccount::unserialize(Conf::MappingNode *map)
// val = (Conf::ScalarNode *)(map->getValue(mailboxKey));
val = (Conf::ScalarNode *)(map->getValue(codecsKey));
- if(val) { _startupCodecStr = val->getValue(); val = NULL; }
+ if(val) { _codecStr = val->getValue(); val = NULL; }
val = (Conf::ScalarNode *)(map->getValue(expireKey));
if(val) { _registrationExpire = val->getValue(); val = NULL; }
--
GitLab