The modules module-loopback and module-virtual-source contained redundant source_output_may_move_to_cb() implementations. Remove them. --- src/modules/module-loopback.c | 12 ------------ src/modules/module-virtual-source.c | 15 --------------- 2 files changed, 27 deletions(-) diff --git a/src/modules/module-loopback.c b/src/modules/module-loopback.c index 461c4a7..22ebc17 100644 --- a/src/modules/module-loopback.c +++ b/src/modules/module-loopback.c @@ -379,17 +379,6 @@ static void source_output_kill_cb(pa_source_output *o) { } /* Called from main thread */ -static pa_bool_t source_output_may_move_to_cb(pa_source_output *o, pa_source *dest) { - struct userdata *u; - - pa_source_output_assert_ref(o); - pa_assert_ctl_context(); - pa_assert_se(u = o->userdata); - - return dest != u->sink_input->sink->monitor_source; -} - -/* Called from main thread */ static void source_output_moving_cb(pa_source_output *o, pa_source *dest) { pa_proplist *p; const char *n; @@ -909,7 +898,6 @@ int pa__init(pa_module *m) { u->source_output->attach = source_output_attach_cb; u->source_output->detach = source_output_detach_cb; u->source_output->state_change = source_output_state_change_cb; - u->source_output->may_move_to = source_output_may_move_to_cb; u->source_output->moving = source_output_moving_cb; u->source_output->suspend = source_output_suspend_cb; u->source_output->userdata = u; diff --git a/src/modules/module-virtual-source.c b/src/modules/module-virtual-source.c index be2de5a..e713b92 100644 --- a/src/modules/module-virtual-source.c +++ b/src/modules/module-virtual-source.c @@ -448,20 +448,6 @@ static void source_output_kill_cb(pa_source_output *o) { } /* Called from main thread */ -static pa_bool_t source_output_may_move_to_cb(pa_source_output *o, pa_source *dest) { - struct userdata *u; - - pa_source_output_assert_ref(o); - pa_assert_ctl_context(); - pa_assert_se(u = o->userdata); - - /* FIXME */ - //return dest != u->source_input->source->monitor_source; - - return TRUE; -} - -/* Called from main thread */ static void source_output_moving_cb(pa_source_output *o, pa_source *dest) { struct userdata *u; @@ -633,7 +619,6 @@ int pa__init(pa_module*m) { u->source_output->attach = source_output_attach_cb; u->source_output->detach = source_output_detach_cb; u->source_output->state_change = source_output_state_change_cb; - u->source_output->may_move_to = source_output_may_move_to_cb; u->source_output->moving = source_output_moving_cb; u->source_output->userdata = u; -- 1.7.9.5