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

don't assume that sink/source is already unregistered from namereg when disconnect hook is called

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1608 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-08-09 21:57:01 +00:00
parent 1c7b84204e
commit 3dfdb21759
1 changed files with 31 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/modules/module-rescue-streams.c
View file

@ -52,20 +52,26 @@ static pa_hook_result_t sink_hook_callback(pa_core *c, pa_sink *sink, void* user
pa_sink_input *i; pa_sink_input *i;
pa_sink *target; pa_sink *target;
assert(c); pa_assert(c);
assert(sink); pa_assert(sink);
if (!pa_idxset_size(sink->inputs)) { if (!pa_idxset_size(sink->inputs)) {
pa_log_debug("No sink inputs to move away."); pa_log_debug("No sink inputs to move away.");
return PA_HOOK_OK; return PA_HOOK_OK;
} }
if (!(target = pa_namereg_get(c, NULL, PA_NAMEREG_SINK, 0))) { if (!(target = pa_namereg_get(c, NULL, PA_NAMEREG_SINK, 0)) || target == sink) {
uint32_t idx;
for (target = pa_idxset_first(c->sinks, &idx); target; target = pa_idxset_next(c->sinks, &idx))
if (target != sink)
break;
if (!target) {
pa_log_info("No evacuation sink found."); pa_log_info("No evacuation sink found.");
return PA_HOOK_OK; return PA_HOOK_OK;
} }
}
assert(target != sink);
while ((i = pa_idxset_first(sink->inputs, NULL))) { while ((i = pa_idxset_first(sink->inputs, NULL))) {
if (pa_sink_input_move_to(i, target, 1) < 0) { if (pa_sink_input_move_to(i, target, 1) < 0) {
@ -84,20 +90,28 @@ static pa_hook_result_t source_hook_callback(pa_core *c, pa_source *source, void
pa_source_output *o; pa_source_output *o;
pa_source *target; pa_source *target;
assert(c); pa_assert(c);
assert(source); pa_assert(source);
if (!pa_idxset_size(source->outputs)) { if (!pa_idxset_size(source->outputs)) {
pa_log_debug("No source outputs to move away."); pa_log_debug("No source outputs to move away.");
return PA_HOOK_OK; return PA_HOOK_OK;
} }
if (!(target = pa_namereg_get(c, NULL, PA_NAMEREG_SOURCE, 0))) { if (!(target = pa_namereg_get(c, NULL, PA_NAMEREG_SOURCE, 0)) || target == source) {
uint32_t idx;
for (target = pa_idxset_first(c->sources, &idx); target; target = pa_idxset_next(c->sources, &idx))
if (target != source && !target->monitor_of == !source->monitor_of)
break;
if (!target) {
pa_log_info("No evacuation source found."); pa_log_info("No evacuation source found.");
return PA_HOOK_OK; return PA_HOOK_OK;
} }
}
assert(target != source); pa_assert(target != source);
while ((o = pa_idxset_first(source->outputs, NULL))) { while ((o = pa_idxset_first(source->outputs, NULL))) {
if (pa_source_output_move_to(o, target) < 0) { if (pa_source_output_move_to(o, target) < 0) {
@ -116,8 +130,8 @@ int pa__init(pa_core *c, pa_module*m) {
pa_modargs *ma = NULL; pa_modargs *ma = NULL;
struct userdata *u; struct userdata *u;
assert(c); pa_assert(c);
assert(m); pa_assert(m);
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) { if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
pa_log("Failed to parse module arguments"); pa_log("Failed to parse module arguments");
@ -135,8 +149,8 @@ int pa__init(pa_core *c, pa_module*m) {
void pa__done(pa_core *c, pa_module*m) { void pa__done(pa_core *c, pa_module*m) {
struct userdata *u; struct userdata *u;
assert(c); pa_assert(c);
assert(m); pa_assert(m);
if (!m->userdata) if (!m->userdata)
return; return;