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: prepare merge with role-ducking: replace "cork" with "interact" where appropriate

Browse source 
Again, interact includes cork and duck.
This commit is contained in:
Georg Chini 2015-03-26 21:54:22 +01:00 • committed by Tanu Kaskinen
parent f12102857a
commit c03cf89b33
3 changed files with 45 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -47,12 +47,12 @@ int pa__init(pa_module *m) {
pa_assert(m); pa_assert(m);
return pa_cork_init(m, valid_modargs); return pa_stream_interaction_init(m, valid_modargs);
} }
void pa__done(pa_module *m) { void pa__done(pa_module *m) {
pa_assert(m); pa_assert(m);
pa_cork_done(m); pa_stream_interaction_done(m);
} }

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

@ -35,9 +35,9 @@
struct userdata { struct userdata {
pa_core *core; pa_core *core;
pa_hashmap *cork_state; pa_hashmap *interaction_state;
pa_idxset *trigger_roles; pa_idxset *trigger_roles;
pa_idxset *cork_roles; pa_idxset *interaction_roles;
bool global:1; bool global:1;
pa_hook_slot pa_hook_slot
*sink_input_put_slot, *sink_input_put_slot,
@ -63,7 +63,7 @@ static const char *is_trigger_stream(struct userdata *u, pa_sink_input *i) {
return NULL; return NULL;
} }
static bool shall_cork(struct userdata *u, pa_sink *s, pa_sink_input *ignore) { static bool shall_interact(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;
@ -86,16 +86,16 @@ static bool shall_cork(struct userdata *u, pa_sink *s, pa_sink_input *ignore) {
return false; return false;
} }
static void cork_stream(struct userdata *u, pa_sink_input *i, const char *cork_role) { static void cork_stream(struct userdata *u, pa_sink_input *i, const char *interaction_role) {
pa_log_debug("Found a '%s' stream that should be corked/muted.", cork_role); pa_log_debug("Found a '%s' stream that should be corked/muted.", 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);
} }
static void uncork_stream(struct userdata *u, pa_sink_input *i, const char *cork_role, bool corked) { static void uncork_stream(struct userdata *u, pa_sink_input *i, const char *interaction_role, bool corked) {
pa_log_debug("Found a '%s' stream that should be uncorked/unmuted.", cork_role); pa_log_debug("Found a '%s' stream that should be uncorked/unmuted.", interaction_role);
if (corked || i->muted) { if (corked || i->muted) {
if (i->muted) if (i->muted)
pa_sink_input_set_mute(i, false, false); pa_sink_input_set_mute(i, false, false);
@ -104,17 +104,17 @@ static void uncork_stream(struct userdata *u, pa_sink_input *i, const char *cork
} }
} }
static inline void apply_cork_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, pa_sink_input *ignore, bool cork) {
pa_sink_input *j; pa_sink_input *j;
uint32_t idx, role_idx; uint32_t idx, role_idx;
const char *cork_role; const char *interaction_role;
bool trigger = false; bool trigger = false;
pa_assert(u); pa_assert(u);
pa_sink_assert_ref(s); pa_sink_assert_ref(s);
for (j = PA_SINK_INPUT(pa_idxset_first(s->inputs, &idx)); j; j = PA_SINK_INPUT(pa_idxset_next(s->inputs, &idx))) { for (j = PA_SINK_INPUT(pa_idxset_first(s->inputs, &idx)); j; j = PA_SINK_INPUT(pa_idxset_next(s->inputs, &idx))) {
bool corked, corked_here; bool corked, interaction_applied;
const char *role; const char *role;
if (j == ignore) if (j == ignore)
@ -123,43 +123,43 @@ static inline void apply_cork_to_sink(struct userdata *u, pa_sink *s, pa_sink_in
if (!(role = pa_proplist_gets(j->proplist, PA_PROP_MEDIA_ROLE))) if (!(role = pa_proplist_gets(j->proplist, PA_PROP_MEDIA_ROLE)))
role = "no_role"; role = "no_role";
PA_IDXSET_FOREACH(cork_role, u->cork_roles, role_idx) { PA_IDXSET_FOREACH(interaction_role, u->interaction_roles, role_idx) {
if ((trigger = pa_streq(role, cork_role))) if ((trigger = pa_streq(role, interaction_role)))
break;
if ((trigger = (pa_streq(cork_role, "any_role") && !is_trigger_stream(u, j))))
break; break;
if ((trigger = (pa_streq(interaction_role, "any_role") && !is_trigger_stream(u, j))))
break;
} }
if (!trigger) if (!trigger)
continue; continue;
corked = (pa_sink_input_get_state(j) == PA_SINK_INPUT_CORKED); corked = (pa_sink_input_get_state(j) == PA_SINK_INPUT_CORKED);
corked_here = !!pa_hashmap_get(u->cork_state, j); interaction_applied = !!pa_hashmap_get(u->interaction_state, j);
if (cork && !corked && !j->muted) { if (cork && !corked && !j->muted) {
if (!corked_here) if (!interaction_applied)
pa_hashmap_put(u->cork_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);
} else if (!cork && corked_here) { } else if (!cork && interaction_applied) {
pa_hashmap_remove(u->cork_state, j); pa_hashmap_remove(u->interaction_state, j);
uncork_stream(u, j, role, corked); uncork_stream(u, j, role, corked);
} }
} }
} }
static void apply_cork(struct userdata *u, pa_sink *s, pa_sink_input *ignore, bool cork) { static void apply_interaction(struct userdata *u, pa_sink *s, pa_sink_input *ignore, bool cork) {
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_cork_to_sink(u, s, ignore, cork); apply_interaction_to_sink(u, s, ignore, cork);
} else } else
apply_cork_to_sink(u, s, ignore, cork); apply_interaction_to_sink(u, s, ignore, cork);
} }
static void remove_cork(struct userdata *u) { static void remove_interactions(struct userdata *u) {
uint32_t idx, idx_input; uint32_t idx, idx_input;
pa_sink *s; pa_sink *s;
pa_sink_input *j; pa_sink_input *j;
@ -170,7 +170,7 @@ static void remove_cork(struct userdata *u) {
for (j = PA_SINK_INPUT(pa_idxset_first(s->inputs, &idx_input)); j; j = PA_SINK_INPUT(pa_idxset_next(s->inputs, &idx_input))) { for (j = PA_SINK_INPUT(pa_idxset_first(s->inputs, &idx_input)); j; j = PA_SINK_INPUT(pa_idxset_next(s->inputs, &idx_input))) {
if(!!pa_hashmap_get(u->cork_state, j)) { if(!!pa_hashmap_get(u->interaction_state, j)) {
corked = (pa_sink_input_get_state(j) == PA_SINK_INPUT_CORKED); corked = (pa_sink_input_get_state(j) == PA_SINK_INPUT_CORKED);
if (!(role = pa_proplist_gets(j->proplist, PA_PROP_MEDIA_ROLE))) if (!(role = pa_proplist_gets(j->proplist, PA_PROP_MEDIA_ROLE)))
role = "no_role"; role = "no_role";
@ -187,13 +187,13 @@ static pa_hook_result_t process(struct userdata *u, pa_sink_input *i, bool creat
pa_sink_input_assert_ref(i); pa_sink_input_assert_ref(i);
if (!create) if (!create)
pa_hashmap_remove(u->cork_state, i); pa_hashmap_remove(u->interaction_state, i);
if (!i->sink) if (!i->sink)
return PA_HOOK_OK; return PA_HOOK_OK;
cork = shall_cork(u, i->sink, create ? NULL : i); cork = shall_interact(u, i->sink, create ? NULL : i);
apply_cork(u, i->sink, create ? NULL : i, cork); apply_interaction(u, i->sink, create ? NULL : i, cork);
return PA_HOOK_OK; return PA_HOOK_OK;
} }
@ -255,7 +255,7 @@ static pa_hook_result_t sink_input_proplist_changed_cb(pa_core *core, pa_sink_in
return PA_HOOK_OK; return PA_HOOK_OK;
} }
int pa_cork_init(pa_module *m, const char* const v_modargs[]) { int pa_stream_interaction_init(pa_module *m, const char* const v_modargs[]) {
pa_modargs *ma = NULL; pa_modargs *ma = NULL;
struct userdata *u; struct userdata *u;
const char *roles; const char *roles;
@ -271,7 +271,7 @@ int pa_cork_init(pa_module *m, const char* const v_modargs[]) {
m->userdata = u = pa_xnew(struct userdata, 1); m->userdata = u = pa_xnew(struct userdata, 1);
u->core = m->core; u->core = m->core;
u->cork_state = pa_hashmap_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func); u->interaction_state = pa_hashmap_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
u->trigger_roles = pa_idxset_new(NULL, NULL); u->trigger_roles = pa_idxset_new(NULL, NULL);
roles = pa_modargs_get_value(ma, "trigger_roles", NULL); roles = pa_modargs_get_value(ma, "trigger_roles", NULL);
@ -290,22 +290,22 @@ int pa_cork_init(pa_module *m, const char* const v_modargs[]) {
pa_idxset_put(u->trigger_roles, pa_xstrdup("phone"), NULL); pa_idxset_put(u->trigger_roles, pa_xstrdup("phone"), NULL);
} }
u->cork_roles = pa_idxset_new(NULL, NULL); u->interaction_roles = pa_idxset_new(NULL, NULL);
roles = pa_modargs_get_value(ma, "cork_roles", NULL); roles = pa_modargs_get_value(ma, "cork_roles", NULL);
if (roles) { if (roles) {
const char *split_state = NULL; const char *split_state = NULL;
char *n = NULL; char *n = NULL;
while ((n = pa_split(roles, ",", &split_state))) { while ((n = pa_split(roles, ",", &split_state))) {
if (n[0] != '\0') if (n[0] != '\0')
pa_idxset_put(u->cork_roles, n, NULL); pa_idxset_put(u->interaction_roles, n, NULL);
else else
pa_xfree(n); pa_xfree(n);
} }
} }
if (pa_idxset_isempty(u->cork_roles)) { if (pa_idxset_isempty(u->interaction_roles)) {
pa_log_debug("Using roles 'music' and 'video' as cork roles."); pa_log_debug("Using roles 'music' and 'video' as cork roles.");
pa_idxset_put(u->cork_roles, pa_xstrdup("music"), NULL); pa_idxset_put(u->interaction_roles, pa_xstrdup("music"), NULL);
pa_idxset_put(u->cork_roles, pa_xstrdup("video"), NULL); pa_idxset_put(u->interaction_roles, pa_xstrdup("video"), NULL);
} }
if (pa_modargs_get_value_boolean(ma, "global", &global) < 0) { if (pa_modargs_get_value_boolean(ma, "global", &global) < 0) {
@ -327,7 +327,7 @@ int pa_cork_init(pa_module *m, const char* const v_modargs[]) {
return 0; return 0;
fail: fail:
pa_cork_done(m); pa_stream_interaction_done(m);
if (ma) if (ma)
pa_modargs_free(ma); pa_modargs_free(ma);
@ -336,7 +336,7 @@ fail:
} }
void pa_cork_done(pa_module *m) { void pa_stream_interaction_done(pa_module *m) {
struct userdata* u; struct userdata* u;
pa_assert(m); pa_assert(m);
@ -347,8 +347,8 @@ void pa_cork_done(pa_module *m) {
if (u->trigger_roles) if (u->trigger_roles)
pa_idxset_free(u->trigger_roles, pa_xfree); pa_idxset_free(u->trigger_roles, pa_xfree);
if (u->cork_roles) if (u->interaction_roles)
pa_idxset_free(u->cork_roles, pa_xfree); pa_idxset_free(u->interaction_roles, pa_xfree);
if (u->sink_input_put_slot) if (u->sink_input_put_slot)
pa_hook_slot_free(u->sink_input_put_slot); pa_hook_slot_free(u->sink_input_put_slot);
@ -365,9 +365,9 @@ void pa_cork_done(pa_module *m) {
if (u->sink_input_proplist_changed_slot) if (u->sink_input_proplist_changed_slot)
pa_hook_slot_free(u->sink_input_proplist_changed_slot); pa_hook_slot_free(u->sink_input_proplist_changed_slot);
if (u->cork_state) { if (u->interaction_state) {
remove_cork(u); remove_interactions(u);
pa_hashmap_free(u->cork_state); pa_hashmap_free(u->interaction_state);
} }
pa_xfree(u); pa_xfree(u);

4
src/modules/stream-interaction.h
View file

@ -17,5 +17,5 @@
along with PulseAudio; if not, see <http://www.gnu.org/licenses/>. along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
***/ ***/
int pa_cork_init(pa_module *m, const char* const v_modargs[]); int pa_stream_interaction_init(pa_module *m, const char* const v_modargs[]);
void pa_cork_done(pa_module *m); void pa_stream_interaction_done(pa_module *m);