Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
751f2de8
Commit
751f2de8
authored
12 years ago
by
Tristan Matthews
Browse files
Options
Downloads
Patches
Plain Diff
* #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
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
daemon/src/account.cpp
+1
-2
1 addition, 2 deletions
daemon/src/account.cpp
daemon/src/dbus/configurationmanager.cpp
+2
-0
2 additions, 0 deletions
daemon/src/dbus/configurationmanager.cpp
gnome/src/actions.c
+3
-2
3 additions, 2 deletions
gnome/src/actions.c
with
6 additions
and
4 deletions
daemon/src/account.cpp
+
1
−
2
View file @
751f2de8
...
@@ -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
);
}
}
...
...
This diff is collapsed.
Click to expand it.
daemon/src/dbus/configurationmanager.cpp
+
2
−
0
View file @
751f2de8
...
@@ -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
());
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
gnome/src/actions.c
+
3
−
2
View file @
751f2de8
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment