From 43e3a7f3c32ef78c69e446aad2c55edd5f1b44b9 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 16 Jan 2019 15:40:53 +0800 Subject: [PATCH] sink: move the streams to the default_sink when the sink is unlinked When a sink is unlinked, all streams of this sink are moved to default_sink, this action is implemented in the core rather than modules now. Signed-off-by: Hui Wang --- src/modules/module-rescue-streams.c | 134 +----------------------------------- src/modules/module-stream-restore.c | 50 -------------- src/pulsecore/core.c | 2 +- src/pulsecore/device-port.c | 2 +- src/pulsecore/sink.c | 20 +++++- src/pulsecore/sink.h | 2 +- 6 files changed, 21 insertions(+), 189 deletions(-) diff --git a/src/modules/module-rescue-streams.c b/src/modules/module-rescue-streams.c index 0d8b1be..a21b95a 100644 --- a/src/modules/module-rescue-streams.c +++ b/src/modules/module-rescue-streams.c @@ -24,7 +24,6 @@ #include #include -#include #include #include #include @@ -32,7 +31,7 @@ #include PA_MODULE_AUTHOR("Lennart Poettering"); -PA_MODULE_DESCRIPTION("When a sink/source is removed, try to move its streams to the default sink/source"); +PA_MODULE_DESCRIPTION("When a source is removed, try to move its streams to the default source"); PA_MODULE_VERSION(PACKAGE_VERSION); PA_MODULE_LOAD_ONCE(true); @@ -42,9 +41,7 @@ static const char* const valid_modargs[] = { struct userdata { pa_hook_slot - *sink_unlink_slot, *source_unlink_slot, - *sink_input_move_fail_slot, *source_output_move_fail_slot; }; @@ -65,23 +62,6 @@ static pa_source* find_source_from_port(pa_core *c, pa_device_port *port) { return NULL; } -static pa_sink* find_sink_from_port(pa_core *c, pa_device_port *port) { - pa_sink *target; - uint32_t idx; - void *state; - pa_device_port *p; - - if (!port) - return NULL; - - PA_IDXSET_FOREACH(target, c->sinks, idx) - PA_HASHMAP_FOREACH(p, target->ports, state) - if (port == p) - return target; - - return NULL; -} - static void build_group_ports(pa_hashmap *g_ports, pa_hashmap *s_ports) { void *state; pa_device_port *p; @@ -93,112 +73,6 @@ static void build_group_ports(pa_hashmap *g_ports, pa_hashmap *s_ports) { pa_hashmap_put(g_ports, p, p); } -static pa_sink* find_evacuation_sink(pa_core *c, pa_sink_input *i, pa_sink *skip) { - pa_sink *target, *fb_sink = NULL; - uint32_t idx; - pa_hashmap *all_ports; - pa_device_port *best_port; - - pa_assert(c); - pa_assert(i); - - if (c->default_sink && c->default_sink != skip && pa_sink_input_may_move_to(i, c->default_sink)) - return c->default_sink; - - all_ports = pa_hashmap_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func); - - PA_IDXSET_FOREACH(target, c->sinks, idx) { - if (target == c->default_sink) - continue; - - if (target == skip) - continue; - - if (!PA_SINK_IS_LINKED(target->state)) - continue; - - if (!pa_sink_input_may_move_to(i, target)) - continue; - - if (!fb_sink) - fb_sink = target; - - build_group_ports(all_ports, target->ports); - } - - best_port = pa_device_port_find_best(all_ports); - - pa_hashmap_free(all_ports); - - if (best_port) - target = find_sink_from_port(c, best_port); - else - target = fb_sink; - - if (!target) - pa_log_debug("No evacuation sink found."); - - return target; -} - -static pa_hook_result_t sink_unlink_hook_callback(pa_core *c, pa_sink *sink, void* userdata) { - pa_sink_input *i; - uint32_t idx; - - pa_assert(c); - pa_assert(sink); - - /* There's no point in doing anything if the core is shut down anyway */ - if (c->state == PA_CORE_SHUTDOWN) - return PA_HOOK_OK; - - if (pa_idxset_size(sink->inputs) <= 0) { - pa_log_debug("No sink inputs to move away."); - return PA_HOOK_OK; - } - - PA_IDXSET_FOREACH(i, sink->inputs, idx) { - pa_sink *target; - - if (!(target = find_evacuation_sink(c, i, sink))) - continue; - - if (pa_sink_input_move_to(i, target, false) < 0) - pa_log_info("Failed to move sink input %u \"%s\" to %s.", i->index, - pa_strnull(pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME)), target->name); - else - pa_log_info("Successfully moved sink input %u \"%s\" to %s.", i->index, - pa_strnull(pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME)), target->name); - } - - return PA_HOOK_OK; -} - -static pa_hook_result_t sink_input_move_fail_hook_callback(pa_core *c, pa_sink_input *i, void *userdata) { - pa_sink *target; - - pa_assert(c); - pa_assert(i); - - /* There's no point in doing anything if the core is shut down anyway */ - if (c->state == PA_CORE_SHUTDOWN) - return PA_HOOK_OK; - - if (!(target = find_evacuation_sink(c, i, NULL))) - return PA_HOOK_OK; - - if (pa_sink_input_finish_move(i, target, false) < 0) { - pa_log_info("Failed to move sink input %u \"%s\" to %s.", i->index, - pa_strnull(pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME)), target->name); - return PA_HOOK_OK; - - } else { - pa_log_info("Successfully moved sink input %u \"%s\" to %s.", i->index, - pa_strnull(pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME)), target->name); - return PA_HOOK_STOP; - } -} - static pa_source* find_evacuation_source(pa_core *c, pa_source_output *o, pa_source *skip) { pa_source *target, *fb_source = NULL; uint32_t idx; @@ -323,10 +197,8 @@ int pa__init(pa_module*m) { m->userdata = u = pa_xnew(struct userdata, 1); /* A little bit later than module-stream-restore, module-intended-roles... */ - u->sink_unlink_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_UNLINK], PA_HOOK_LATE+20, (pa_hook_cb_t) sink_unlink_hook_callback, u); u->source_unlink_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_UNLINK], PA_HOOK_LATE+20, (pa_hook_cb_t) source_unlink_hook_callback, u); - u->sink_input_move_fail_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_INPUT_MOVE_FAIL], PA_HOOK_LATE+20, (pa_hook_cb_t) sink_input_move_fail_hook_callback, u); u->source_output_move_fail_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_MOVE_FAIL], PA_HOOK_LATE+20, (pa_hook_cb_t) source_output_move_fail_hook_callback, u); pa_modargs_free(ma); @@ -341,13 +213,9 @@ void pa__done(pa_module*m) { if (!(u = m->userdata)) return; - if (u->sink_unlink_slot) - pa_hook_slot_free(u->sink_unlink_slot); if (u->source_unlink_slot) pa_hook_slot_free(u->source_unlink_slot); - if (u->sink_input_move_fail_slot) - pa_hook_slot_free(u->sink_input_move_fail_slot); if (u->source_output_move_fail_slot) pa_hook_slot_free(u->source_output_move_fail_slot); diff --git a/src/modules/module-stream-restore.c b/src/modules/module-stream-restore.c index b811a18..1481058 100644 --- a/src/modules/module-stream-restore.c +++ b/src/modules/module-stream-restore.c @@ -96,7 +96,6 @@ struct userdata { *source_output_new_hook_slot, *source_output_fixate_hook_slot, *source_put_hook_slot, - *sink_unlink_hook_slot, *source_unlink_hook_slot, *connection_unlink_hook_slot; pa_time_event *save_time_event; @@ -1691,54 +1690,6 @@ static pa_hook_result_t source_put_hook_callback(pa_core *c, pa_source *source, return PA_HOOK_OK; } -static pa_hook_result_t sink_unlink_hook_callback(pa_core *c, pa_sink *sink, struct userdata *u) { - pa_sink_input *si; - uint32_t idx; - - pa_assert(c); - pa_assert(sink); - pa_assert(u); - pa_assert(u->on_rescue && u->restore_device); - - /* There's no point in doing anything if the core is shut down anyway */ - if (c->state == PA_CORE_SHUTDOWN) - return PA_HOOK_OK; - - PA_IDXSET_FOREACH(si, sink->inputs, idx) { - char *name; - struct entry *e; - - if (!si->sink) - continue; - - /* Skip this sink input if it is connecting a filter sink to - * the master */ - if (si->origin_sink) - continue; - - if (!(name = pa_proplist_get_stream_group(si->proplist, "sink-input", IDENTIFICATION_PROPERTY))) - continue; - - if ((e = entry_read(u, name))) { - - if (e->device_valid) { - pa_sink *d; - - if ((d = pa_namereg_get(c, e->device, PA_NAMEREG_SINK)) && - d != sink && - PA_SINK_IS_LINKED(d->state)) - pa_sink_input_move_to(si, d, true); - } - - entry_free(e); - } - - pa_xfree(name); - } - - return PA_HOOK_OK; -} - static pa_hook_result_t source_unlink_hook_callback(pa_core *c, pa_source *source, struct userdata *u) { pa_source_output *so; uint32_t idx; @@ -2418,7 +2369,6 @@ int pa__init(pa_module*m) { if (restore_device && on_rescue) { /* A little bit earlier than module-intended-roles, module-rescue-streams, ... */ - pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_SINK_UNLINK], PA_HOOK_LATE, (pa_hook_cb_t) sink_unlink_hook_callback, u); pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_SOURCE_UNLINK], PA_HOOK_LATE, (pa_hook_cb_t) source_unlink_hook_callback, u); } diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c index 496accd..f251fb5 100644 --- a/src/pulsecore/core.c +++ b/src/pulsecore/core.c @@ -352,7 +352,7 @@ void pa_core_update_default_sink(pa_core *core) { /* try to move the streams from old_default_sink to the new default_sink conditionally */ if (old_default_sink) - pa_sink_move_streams_to_default_sink(core, old_default_sink); + pa_sink_move_streams_to_default_sink(core, old_default_sink, true); } /* a < b -> return -1 diff --git a/src/pulsecore/device-port.c b/src/pulsecore/device-port.c index 4a42cf7..28e78a6 100644 --- a/src/pulsecore/device-port.c +++ b/src/pulsecore/device-port.c @@ -106,7 +106,7 @@ void pa_device_port_set_available(pa_device_port *p, pa_available_t status) { sink = pa_device_port_get_sink(p); if (sink && p == sink->active_port) { if (sink->active_port->available == PA_AVAILABLE_NO) - pa_sink_move_streams_to_default_sink(p->core, sink); + pa_sink_move_streams_to_default_sink(p->core, sink, false); else pa_core_move_streams_to_newly_available_preferred_sink(p->core, sink); } diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c index d378b99..631acf6 100644 --- a/src/pulsecore/sink.c +++ b/src/pulsecore/sink.c @@ -762,6 +762,9 @@ void pa_sink_unlink(pa_sink* s) { pa_core_update_default_sink(s->core); + if (linked) + pa_sink_move_streams_to_default_sink(s->core, s, false); + if (s->card) pa_idxset_remove_by_data(s->card->sinks, s, NULL); @@ -3937,7 +3940,7 @@ void pa_sink_set_reference_volume_direct(pa_sink *s, const pa_cvolume *volume) { pa_hook_fire(&s->core->hooks[PA_CORE_HOOK_SINK_VOLUME_CHANGED], s); } -void pa_sink_move_streams_to_default_sink(pa_core *core, pa_sink *old_sink) { +void pa_sink_move_streams_to_default_sink(pa_core *core, pa_sink *old_sink, bool default_sink_changed) { pa_sink_input *i; uint32_t idx; bool old_sink_is_unavailable = false; @@ -3945,6 +3948,9 @@ void pa_sink_move_streams_to_default_sink(pa_core *core, pa_sink *old_sink) { pa_assert(core); pa_assert(old_sink); + if (core->state == PA_CORE_SHUTDOWN) + return; + if (core->default_sink == NULL || core->default_sink->unlink_requested) return; @@ -3964,8 +3970,16 @@ void pa_sink_move_streams_to_default_sink(pa_core *core, pa_sink *old_sink) { if (pa_safe_streq(old_sink->name, i->preferred_sink) && !old_sink_is_unavailable) continue; - pa_log_info("The sink input %u \"%s\" is moving to %s due to change of the default sink.", - i->index, pa_strnull(pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME)), core->default_sink->name); + if (!pa_sink_input_may_move_to(i, core->default_sink)) + continue; + + if (default_sink_changed) + pa_log_info("The sink input %u \"%s\" is moving to %s due to change of the default sink.", + i->index, pa_strnull(pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME)), core->default_sink->name); + else + pa_log_info("The sink input %u \"%s\" is moving to %s due to unlink of a sink.", + i->index, pa_strnull(pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME)), core->default_sink->name); + pa_sink_input_move_to(i, core->default_sink, false); } } diff --git a/src/pulsecore/sink.h b/src/pulsecore/sink.h index 7a72937..1778eb7 100644 --- a/src/pulsecore/sink.h +++ b/src/pulsecore/sink.h @@ -562,7 +562,7 @@ void pa_sink_set_reference_volume_direct(pa_sink *s, const pa_cvolume *volume); * PA_AVAILABLE_NO, this function is called to move the streams of the old * default_sink or the sink with active_port equals PA_AVAILABLE_NO to the * current default_sink conditionally*/ -void pa_sink_move_streams_to_default_sink(pa_core *core, pa_sink *old_sink); +void pa_sink_move_streams_to_default_sink(pa_core *core, pa_sink *old_sink, bool default_sink_changed); /* Verify that we called in IO context (aka 'thread context), or that * the sink is not yet set up, i.e. the thread not set up yet. See -- 2.7.4