module-switch-*: use pa_module_hook_connect

Refactoring, no functional change.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
This commit is contained in:
David Henningsson 2015-03-27 11:20:16 +01:00
parent 10d9d8af5f
commit 37a7834737
2 changed files with 10 additions and 46 deletions

View file

@ -49,9 +49,6 @@ static const char* const valid_modargs[] = {
};
struct userdata {
pa_hook_slot
*sink_put_slot,
*source_put_slot;
bool only_from_unavailable;
};
@ -183,8 +180,8 @@ int pa__init(pa_module*m) {
m->userdata = u = pa_xnew0(struct userdata, 1);
/* A little bit later than module-rescue-streams... */
u->sink_put_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_PUT], PA_HOOK_LATE+30, (pa_hook_cb_t) sink_put_hook_callback, u);
u->source_put_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_PUT], PA_HOOK_LATE+20, (pa_hook_cb_t) source_put_hook_callback, u);
pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_SINK_PUT], PA_HOOK_LATE+30, (pa_hook_cb_t) sink_put_hook_callback, u);
pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_SOURCE_PUT], PA_HOOK_LATE+20, (pa_hook_cb_t) source_put_hook_callback, u);
if (pa_modargs_get_value_boolean(ma, "only_from_unavailable", &u->only_from_unavailable) < 0) {
pa_log("Failed to get a boolean value for only_from_unavailable.");
@ -211,10 +208,5 @@ void pa__done(pa_module*m) {
if (!(u = m->userdata))
return;
if (u->sink_put_slot)
pa_hook_slot_free(u->sink_put_slot);
if (u->source_put_slot)
pa_hook_slot_free(u->source_put_slot);
pa_xfree(u);
}