mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

role-cork: Don't ignore streams without media.role

Browse source 
When corking do not ignore streams without media.role. Instead treat
them as if media.role="no_role", so that you can specify "no_role" as
trigger or cork role.
This commit is contained in:
Georg Chini 2015-03-26 21:54:17 +01:00 • committed by Tanu Kaskinen
parent 092eb57974
commit 61164d3b51
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/module-role-cork.c
View file

@ -77,7 +77,7 @@ static bool shall_cork(struct userdata *u, pa_sink *s, pa_sink_input *ignore) {
continue; continue;
if (!(role = pa_proplist_gets(j->proplist, PA_PROP_MEDIA_ROLE))) if (!(role = pa_proplist_gets(j->proplist, PA_PROP_MEDIA_ROLE)))
continue; role = "no_role";
PA_IDXSET_FOREACH(trigger_role, u->trigger_roles, role_idx) { PA_IDXSET_FOREACH(trigger_role, u->trigger_roles, role_idx) {
if (pa_streq(role, trigger_role)) { if (pa_streq(role, trigger_role)) {
@ -107,7 +107,7 @@ static inline void apply_cork_to_sink(struct userdata *u, pa_sink *s, pa_sink_in
continue; continue;
if (!(role = pa_proplist_gets(j->proplist, PA_PROP_MEDIA_ROLE))) if (!(role = pa_proplist_gets(j->proplist, PA_PROP_MEDIA_ROLE)))
continue; role = "no_role";
PA_IDXSET_FOREACH(cork_role, u->cork_roles, role_idx) { PA_IDXSET_FOREACH(cork_role, u->cork_roles, role_idx) {
if ((trigger = pa_streq(role, cork_role))) if ((trigger = pa_streq(role, cork_role)))
@ -152,7 +152,6 @@ static void apply_cork(struct userdata *u, pa_sink *s, pa_sink_input *ignore, bo
static pa_hook_result_t process(struct userdata *u, pa_sink_input *i, bool create) { static pa_hook_result_t process(struct userdata *u, pa_sink_input *i, bool create) {
bool cork = false; bool cork = false;
const char *role;
pa_assert(u); pa_assert(u);
pa_sink_input_assert_ref(i); pa_sink_input_assert_ref(i);
@ -160,9 +159,6 @@ static pa_hook_result_t process(struct userdata *u, pa_sink_input *i, bool creat
if (!create) if (!create)
pa_hashmap_remove(u->cork_state, i); pa_hashmap_remove(u->cork_state, i);
if (!(role = pa_proplist_gets(i->proplist, PA_PROP_MEDIA_ROLE)))
return PA_HOOK_OK;
if (!i->sink) if (!i->sink)
return PA_HOOK_OK; return PA_HOOK_OK;