properly implement a pa_sink_disconnect() hook

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1243 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-08-13 17:33:32 +00:00
parent 87e64d5845
commit 8180832898
3 changed files with 7 additions and 4 deletions

View file

@ -93,7 +93,7 @@ pa_core* pa_core_new(pa_mainloop_api *m) {
c->is_system_instance = 0;
pa_hook_init(&c->hook_sink_input_new, c);
pa_hook_init(&c->hook_sink_input_disconnect, c);
pa_hook_init(&c->hook_sink_disconnect, c);
pa_property_init(c);
@ -142,7 +142,7 @@ void pa_core_free(pa_core *c) {
pa_property_cleanup(c);
pa_hook_free(&c->hook_sink_input_new);
pa_hook_free(&c->hook_sink_input_disconnect);
pa_hook_free(&c->hook_sink_disconnect);
pa_xfree(c);
}

View file

@ -81,7 +81,8 @@ struct pa_core {
int is_system_instance;
/* hooks */
pa_hook hook_sink_input_new, hook_sink_input_disconnect;
pa_hook hook_sink_input_new,
hook_sink_disconnect;
};
pa_core* pa_core_new(pa_mainloop_api *m);

View file

@ -143,7 +143,10 @@ void pa_sink_disconnect(pa_sink* s) {
assert(s);
assert(s->state == PA_SINK_RUNNING);
s->state = PA_SINK_DISCONNECTED;
pa_namereg_unregister(s->core, s->name);
pa_hook_fire(&s->core->hook_sink_disconnect, s);
while ((i = pa_idxset_first(s->inputs, NULL))) {
assert(i != j);
@ -163,7 +166,6 @@ void pa_sink_disconnect(pa_sink* s) {
s->set_hw_mute = NULL;
s->get_hw_mute = NULL;
s->state = PA_SINK_DISCONNECTED;
pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SINK | PA_SUBSCRIPTION_EVENT_REMOVE, s->index);
}