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

device-manager: Play nice with module-stream-restore.

Browse source 
If m-s-r sets the device we let it do so. Otherwise we handle the routing. We run before
module-intended-roles as the priority list will likely be configured appropriately
to do the same job, albeit with manual setup.
This commit is contained in:
Colin Guthrie 2009-10-02 22:44:56 +01:00
parent cc31d7c35a
commit 9d7a27ec88
1 changed files with 47 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/modules/module-device-manager.c
View file

@ -518,6 +518,9 @@ static void route_sink_input(struct userdata *u, pa_sink_input *si) {
pa_assert(u); pa_assert(u);
pa_assert(u->do_routing); pa_assert(u->do_routing);
if (si->save_sink)
return;
/* Skip this if it is already in the process of being moved anyway */ /* Skip this if it is already in the process of being moved anyway */
if (!si->sink) if (!si->sink)
return; return;
@ -544,7 +547,7 @@ static void route_sink_input(struct userdata *u, pa_sink_input *si) {
return; return;
if (si->sink != sink) if (si->sink != sink)
pa_sink_input_move_to(si, sink, TRUE); pa_sink_input_move_to(si, sink, FALSE);
} }
static pa_hook_result_t route_sink_inputs(struct userdata *u, pa_sink *ignore_sink) { static pa_hook_result_t route_sink_inputs(struct userdata *u, pa_sink *ignore_sink) {
@ -573,6 +576,9 @@ static void route_source_output(struct userdata *u, pa_source_output *so) {
pa_assert(u); pa_assert(u);
pa_assert(u->do_routing); pa_assert(u->do_routing);
if (so->save_source)
return;
if (so->direct_on_input) if (so->direct_on_input)
return; return;
@ -602,7 +608,7 @@ static void route_source_output(struct userdata *u, pa_source_output *so) {
return; return;
if (so->source != source) if (so->source != source)
pa_source_output_move_to(so, source, TRUE); pa_source_output_move_to(so, source, FALSE);
} }
static pa_hook_result_t route_source_outputs(struct userdata *u, pa_source* ignore_source) { static pa_hook_result_t route_source_outputs(struct userdata *u, pa_source* ignore_source) {
@ -811,8 +817,8 @@ static pa_hook_result_t sink_input_new_hook_callback(pa_core *c, pa_sink_input_n
return PA_HOOK_OK; return PA_HOOK_OK;
if (new_data->sink) if (new_data->sink)
pa_log_debug("Overriding device for stream, even although it is already set. I am evil that way..."); pa_log_debug("Not restoring device for stream because already set.");
else {
if (!(role = pa_proplist_gets(new_data->proplist, PA_PROP_MEDIA_ROLE))) if (!(role = pa_proplist_gets(new_data->proplist, PA_PROP_MEDIA_ROLE)))
role_index = get_role_index("none"); role_index = get_role_index("none");
else else
@ -827,6 +833,8 @@ static pa_hook_result_t sink_input_new_hook_callback(pa_core *c, pa_sink_input_n
if ((sink = pa_idxset_get_by_index(u->core->sinks, device_index))) { if ((sink = pa_idxset_get_by_index(u->core->sinks, device_index))) {
new_data->sink = sink; new_data->sink = sink;
new_data->save_sink = FALSE;
}
} }
} }
} }
@ -849,8 +857,8 @@ static pa_hook_result_t source_output_new_hook_callback(pa_core *c, pa_source_ou
return PA_HOOK_OK; return PA_HOOK_OK;
if (new_data->source) if (new_data->source)
pa_log_debug("Overriding device for stream, even although it is already set. I am evil that way..."); pa_log_debug("Not restoring device for stream because already set.");
else {
if (!(role = pa_proplist_gets(new_data->proplist, PA_PROP_MEDIA_ROLE))) if (!(role = pa_proplist_gets(new_data->proplist, PA_PROP_MEDIA_ROLE)))
role_index = get_role_index("none"); role_index = get_role_index("none");
else else
@ -865,6 +873,8 @@ static pa_hook_result_t source_output_new_hook_callback(pa_core *c, pa_source_ou
if ((source = pa_idxset_get_by_index(u->core->sources, device_index))) { if ((source = pa_idxset_get_by_index(u->core->sources, device_index))) {
new_data->source = source; new_data->source = source;
new_data->save_source = FALSE;
}
} }
} }
} }
@ -1422,20 +1432,20 @@ int pa__init(pa_module*m) {
u->source_new_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_NEW], PA_HOOK_EARLY, (pa_hook_cb_t) source_new_hook_callback, u); u->source_new_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_NEW], PA_HOOK_EARLY, (pa_hook_cb_t) source_new_hook_callback, u);
/* The following slots are used to deal with routing */ /* The following slots are used to deal with routing */
/* A little bit later than module-stream-restore, module-intended-roles */ /* A little bit later than module-stream-restore, but before module-intended-roles */
u->sink_input_new_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_INPUT_NEW], PA_HOOK_EARLY+15, (pa_hook_cb_t) sink_input_new_hook_callback, u); u->sink_input_new_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_INPUT_NEW], PA_HOOK_EARLY+5, (pa_hook_cb_t) sink_input_new_hook_callback, u);
u->source_output_new_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_NEW], PA_HOOK_EARLY+15, (pa_hook_cb_t) source_output_new_hook_callback, u); u->source_output_new_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_NEW], PA_HOOK_EARLY+5, (pa_hook_cb_t) source_output_new_hook_callback, u);
if (on_hotplug) { if (on_hotplug) {
/* A little bit later than module-stream-restore, module-intended-roles */ /* A little bit later than module-stream-restore, but before module-intended-roles */
u->sink_put_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_PUT], PA_HOOK_LATE+15, (pa_hook_cb_t) sink_put_hook_callback, u); u->sink_put_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_PUT], PA_HOOK_LATE+5, (pa_hook_cb_t) sink_put_hook_callback, u);
u->source_put_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_PUT], PA_HOOK_LATE+15, (pa_hook_cb_t) source_put_hook_callback, u); u->source_put_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_PUT], PA_HOOK_LATE+5, (pa_hook_cb_t) source_put_hook_callback, u);
} }
if (on_rescue) { if (on_rescue) {
/* A little bit later than module-stream-restore, module-intended-roles, a little bit earlier than module-rescue-streams, ... */ /* A little bit later than module-stream-restore, a little bit earlier than module-intended-roles, module-rescue-streams, ... */
u->sink_unlink_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_UNLINK], PA_HOOK_LATE+15, (pa_hook_cb_t) sink_unlink_hook_callback, u); u->sink_unlink_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_UNLINK], PA_HOOK_LATE+5, (pa_hook_cb_t) sink_unlink_hook_callback, u);
u->source_unlink_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_UNLINK], PA_HOOK_LATE+15, (pa_hook_cb_t) source_unlink_hook_callback, u); u->source_unlink_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_UNLINK], PA_HOOK_LATE+5, (pa_hook_cb_t) source_unlink_hook_callback, u);
} }
if (!(fname = pa_state_path("device-manager", TRUE))) if (!(fname = pa_state_path("device-manager", TRUE)))