mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

role-cork: more cosmetic changes, changed debug output

Browse source 
Change names of shall_interact() and is_trigger_stream() because the names look
like the functions return a boolean. Simpler debugging output.
This commit is contained in:
Georg Chini 2015-03-26 21:54:23 +01:00 • committed by Tanu Kaskinen
parent c03cf89b33
commit bc10d26621
1 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/modules/stream-interaction.c
View file

@ -49,7 +49,7 @@ struct userdata {
*sink_input_proplist_changed_slot; *sink_input_proplist_changed_slot;
}; };
static const char *is_trigger_stream(struct userdata *u, pa_sink_input *i) { static const char *get_trigger_role(struct userdata *u, pa_sink_input *i) {
const char *role, *trigger_role; const char *role, *trigger_role;
uint32_t role_idx; uint32_t role_idx;
@ -63,7 +63,7 @@ static const char *is_trigger_stream(struct userdata *u, pa_sink_input *i) {
return NULL; return NULL;
} }
static bool shall_interact(struct userdata *u, pa_sink *s, pa_sink_input *ignore) { static const char *find_trigger_stream(struct userdata *u, pa_sink *s, pa_sink_input *ignore) {
pa_sink_input *j; pa_sink_input *j;
uint32_t idx; uint32_t idx;
const char *trigger_role; const char *trigger_role;
@ -76,19 +76,17 @@ static bool shall_interact(struct userdata *u, pa_sink *s, pa_sink_input *ignore
if (j == ignore) if (j == ignore)
continue; continue;
trigger_role = is_trigger_stream(u, j); trigger_role = get_trigger_role(u, j);
if (trigger_role && !j->muted && pa_sink_input_get_state(j) != PA_SINK_INPUT_CORKED) { if (trigger_role && !j->muted && pa_sink_input_get_state(j) != PA_SINK_INPUT_CORKED)
pa_log_debug("Found a '%s' stream that will trigger the auto-cork.", trigger_role); return trigger_role;
return true;
}
} }
return false; return NULL;
} }
static void cork_stream(struct userdata *u, pa_sink_input *i, const char *interaction_role) { static void cork_stream(struct userdata *u, pa_sink_input *i, const char *interaction_role, const char *trigger_role) {
pa_log_debug("Found a '%s' stream that should be corked/muted.", interaction_role); pa_log_debug("Found a '%s' stream that corks/mutes a '%s' stream.", trigger_role, interaction_role);
pa_sink_input_set_mute(i, true, false); pa_sink_input_set_mute(i, true, false);
pa_sink_input_send_event(i, PA_STREAM_EVENT_REQUEST_CORK, NULL); pa_sink_input_send_event(i, PA_STREAM_EVENT_REQUEST_CORK, NULL);
} }
@ -104,7 +102,7 @@ static void uncork_stream(struct userdata *u, pa_sink_input *i, const char *inte
} }
} }
static inline void apply_interaction_to_sink(struct userdata *u, pa_sink *s, pa_sink_input *ignore, bool cork) { static inline void apply_interaction_to_sink(struct userdata *u, pa_sink *s, const char *new_trigger, pa_sink_input *ignore) {
pa_sink_input *j; pa_sink_input *j;
uint32_t idx, role_idx; uint32_t idx, role_idx;
const char *interaction_role; const char *interaction_role;
@ -126,7 +124,7 @@ static inline void apply_interaction_to_sink(struct userdata *u, pa_sink *s, pa_
PA_IDXSET_FOREACH(interaction_role, u->interaction_roles, role_idx) { PA_IDXSET_FOREACH(interaction_role, u->interaction_roles, role_idx) {
if ((trigger = pa_streq(role, interaction_role))) if ((trigger = pa_streq(role, interaction_role)))
break; break;
if ((trigger = (pa_streq(interaction_role, "any_role") && !is_trigger_stream(u, j)))) if ((trigger = (pa_streq(interaction_role, "any_role") && !get_trigger_role(u, j))))
break; break;
} }
if (!trigger) if (!trigger)
@ -135,12 +133,12 @@ static inline void apply_interaction_to_sink(struct userdata *u, pa_sink *s, pa_
corked = (pa_sink_input_get_state(j) == PA_SINK_INPUT_CORKED); corked = (pa_sink_input_get_state(j) == PA_SINK_INPUT_CORKED);
interaction_applied = !!pa_hashmap_get(u->interaction_state, j); interaction_applied = !!pa_hashmap_get(u->interaction_state, j);
if (cork && !corked && !j->muted) { if (new_trigger && !corked && !j->muted) {
if (!interaction_applied) if (!interaction_applied)
pa_hashmap_put(u->interaction_state, j, PA_INT_TO_PTR(1)); pa_hashmap_put(u->interaction_state, j, PA_INT_TO_PTR(1));
cork_stream(u, j, role); cork_stream(u, j, role, new_trigger);
} else if (!cork && interaction_applied) { } else if (!new_trigger && interaction_applied) {
pa_hashmap_remove(u->interaction_state, j); pa_hashmap_remove(u->interaction_state, j);
uncork_stream(u, j, role, corked); uncork_stream(u, j, role, corked);
@ -148,15 +146,15 @@ static inline void apply_interaction_to_sink(struct userdata *u, pa_sink *s, pa_
} }
} }
static void apply_interaction(struct userdata *u, pa_sink *s, pa_sink_input *ignore, bool cork) { static void apply_interaction(struct userdata *u, pa_sink *s, const char *trigger_role, pa_sink_input *ignore) {
pa_assert(u); pa_assert(u);
if (u->global) { if (u->global) {
uint32_t idx; uint32_t idx;
PA_IDXSET_FOREACH(s, u->core->sinks, idx) PA_IDXSET_FOREACH(s, u->core->sinks, idx)
apply_interaction_to_sink(u, s, ignore, cork); apply_interaction_to_sink(u, s, trigger_role, ignore);
} else } else
apply_interaction_to_sink(u, s, ignore, cork); apply_interaction_to_sink(u, s, trigger_role, ignore);
} }
static void remove_interactions(struct userdata *u) { static void remove_interactions(struct userdata *u) {
@ -181,7 +179,7 @@ static void remove_interactions(struct userdata *u) {
} }
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; const char *trigger_role;
pa_assert(u); pa_assert(u);
pa_sink_input_assert_ref(i); pa_sink_input_assert_ref(i);
@ -192,8 +190,8 @@ static pa_hook_result_t process(struct userdata *u, pa_sink_input *i, bool creat
if (!i->sink) if (!i->sink)
return PA_HOOK_OK; return PA_HOOK_OK;
cork = shall_interact(u, i->sink, create ? NULL : i); trigger_role = find_trigger_stream(u, i->sink, create ? NULL : i);
apply_interaction(u, i->sink, create ? NULL : i, cork); apply_interaction(u, i->sink, trigger_role, create ? NULL : i);
return PA_HOOK_OK; return PA_HOOK_OK;
} }
@ -229,7 +227,7 @@ static pa_hook_result_t sink_input_state_changed_cb(pa_core *core, pa_sink_input
pa_core_assert_ref(core); pa_core_assert_ref(core);
pa_sink_input_assert_ref(i); pa_sink_input_assert_ref(i);
if (PA_SINK_INPUT_IS_LINKED(pa_sink_input_get_state(i)) && is_trigger_stream(u, i)) if (PA_SINK_INPUT_IS_LINKED(pa_sink_input_get_state(i)) && get_trigger_role(u, i))
return process(u, i, true); return process(u, i, true);
return PA_HOOK_OK; return PA_HOOK_OK;
@ -239,7 +237,7 @@ static pa_hook_result_t sink_input_mute_changed_cb(pa_core *core, pa_sink_input
pa_core_assert_ref(core); pa_core_assert_ref(core);
pa_sink_input_assert_ref(i); pa_sink_input_assert_ref(i);
if (PA_SINK_INPUT_IS_LINKED(pa_sink_input_get_state(i)) && is_trigger_stream(u, i)) if (PA_SINK_INPUT_IS_LINKED(pa_sink_input_get_state(i)) && get_trigger_role(u, i))
return process(u, i, true); return process(u, i, true);
return PA_HOOK_OK; return PA_HOOK_OK;