Skip to content
Snippets Groups Projects
Commit df85a6d2 authored by Alexandre Savard's avatar Alexandre Savard
Browse files

[#2926] Code Cleanup

parent bee2a2d4
Branches
Tags
No related merge requests found
...@@ -58,7 +58,7 @@ void Account::loadConfig() { ...@@ -58,7 +58,7 @@ void Account::loadConfig() {
void Account::setRegistrationState (RegistrationState state) { void Account::setRegistrationState (RegistrationState state) {
if (state != _registrationState) { if (state != _registrationState) {
_debug ("Account::setRegistrationState"); _debug ("Account: set registration state");
_registrationState = state; _registrationState = state;
// Notify the client // Notify the client
...@@ -70,7 +70,7 @@ void Account::loadAudioCodecs (void) { ...@@ -70,7 +70,7 @@ void Account::loadAudioCodecs (void) {
// if the user never set the codec list, use the default configuration for this account // if the user never set the codec list, use the default configuration for this account
if (Manager::instance ().getConfigString (_accountID, "ActiveCodecs") == "") { if (Manager::instance ().getConfigString (_accountID, "ActiveCodecs") == "") {
_warn ("use the default order"); _info ("Account: use the default order");
Manager::instance ().getCodecDescriptorMap ().setDefaultOrder(); Manager::instance ().getCodecDescriptorMap ().setDefaultOrder();
} }
...@@ -92,12 +92,11 @@ void Account::setActiveCodecs (const std::vector <std::string> &list) { ...@@ -92,12 +92,11 @@ void Account::setActiveCodecs (const std::vector <std::string> &list) {
int payload; int payload;
size_t size = list.size(); size_t size = list.size();
_warn ("set the custom order %i", list.size ()); _info ("Account: Set the custom order %i", list.size ());
_warn ("Setting active codec list");
while ( (unsigned int) i < size) { while ( (unsigned int) i < size) {
payload = std::atoi (list[i].data()); payload = std::atoi (list[i].data());
_warn ("Adding codec with RTP payload=%i", payload); _info ("Account: Adding codec with RTP payload=%i", payload);
//if (Manager::instance ().getCodecDescriptorMap ().isCodecLoaded (payload)) { //if (Manager::instance ().getCodecDescriptorMap ().isCodecLoaded (payload)) {
_codecOrder.push_back ( (AudioCodecType) payload); _codecOrder.push_back ( (AudioCodecType) payload);
//} //}
...@@ -106,7 +105,7 @@ void Account::setActiveCodecs (const std::vector <std::string> &list) { ...@@ -106,7 +105,7 @@ void Account::setActiveCodecs (const std::vector <std::string> &list) {
// setConfig // setConfig
std::string s = Manager::instance ().serialize (list); std::string s = Manager::instance ().serialize (list);
_warn ("Setting codec with payload number %s to the active list", s.c_str()); _info ("Account: Setting codec with payload number %s to the active list", s.c_str());
// Set the config per account // Set the config per account
Manager::instance().setConfig (_accountID, "ActiveCodecs", s); Manager::instance().setConfig (_accountID, "ActiveCodecs", s);
......
...@@ -2381,7 +2381,7 @@ ManagerImpl::initConfigFile (bool load_user_value, std::string alternate) ...@@ -2381,7 +2381,7 @@ ManagerImpl::initConfigFile (bool load_user_value, std::string alternate)
void void
ManagerImpl::initAudioCodec (void) ManagerImpl::initAudioCodec (void)
{ {
_warn ("Init audio codecs"); _info("Manager: Init audio codecs");
/* Init list of all supported codecs by the application. /* Init list of all supported codecs by the application.
* This is a global list. Every account will inherit it. * This is a global list. Every account will inherit it.
...@@ -2396,7 +2396,7 @@ std::vector<std::string> ManagerImpl::retrieveActiveCodecs() { ...@@ -2396,7 +2396,7 @@ std::vector<std::string> ManagerImpl::retrieveActiveCodecs() {
// This property is now set per account basis // This property is now set per account basis
std::string s = getConfigString (AUDIO, "ActiveCodecs"); std::string s = getConfigString (AUDIO, "ActiveCodecs");
_warn ("ManagerImpl::retrieveActiveCodecs: %s", s.c_str ()); _info("Manager: Retrieve active codecs: %s", s.c_str ());
return unserialize (s); return unserialize (s);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment