Skip to content
Snippets Groups Projects
Commit 751f2de8 authored by Tristan Matthews's avatar Tristan Matthews
Browse files

* #14745: gnome: make sure codecs are set to active if in the "active" list

parent 551f3ce0
No related branches found
No related tags found
No related merge requests found
...@@ -203,8 +203,7 @@ void Account::setActiveAudioCodecs(const vector<string> &list) ...@@ -203,8 +203,7 @@ void Account::setActiveAudioCodecs(const vector<string> &list)
// list contains the ordered payload of active codecs picked by the user for this account // list contains the ordered payload of active codecs picked by the user for this account
// we used the codec vector to save the order. // we used the codec vector to save the order.
for (vector<string>::const_iterator iter = list.begin(); iter != list.end(); for (vector<string>::const_iterator iter = list.begin(); iter != list.end(); ++iter) {
++iter) {
int payload = std::atoi(iter->c_str()); int payload = std::atoi(iter->c_str());
audioCodecList_.push_back(payload); audioCodecList_.push_back(payload);
} }
......
...@@ -230,6 +230,8 @@ void ConfigurationManager::setActiveAudioCodecList(const std::vector<std::string ...@@ -230,6 +230,8 @@ void ConfigurationManager::setActiveAudioCodecList(const std::vector<std::string
if (acc) { if (acc) {
acc->setActiveAudioCodecs(list); acc->setActiveAudioCodecs(list);
Manager::instance().saveConfig(); Manager::instance().saveConfig();
} else {
ERROR("Could not find account %s", accountID.c_str());
} }
} }
......
...@@ -890,9 +890,10 @@ sflphone_fill_audio_codec_list_per_account(account_t *account) ...@@ -890,9 +890,10 @@ sflphone_fill_audio_codec_list_per_account(account_t *account)
codec_t *orig = codec_list_get_by_payload(payload, system_acodecs); codec_t *orig = codec_list_get_by_payload(payload, system_acodecs);
codec_t *c = codec_create_new_from_caps(orig); codec_t *c = codec_create_new_from_caps(orig);
if (c) if (c) {
c->is_active = TRUE;
g_queue_push_tail(account->acodecs, c); g_queue_push_tail(account->acodecs, c);
else } else
ERROR("Couldn't find codec %d %p", payload, orig); ERROR("Couldn't find codec %d %p", payload, orig);
} }
g_array_unref(order); g_array_unref(order);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment