diff options
| author | Lennart Poettering <lennart@poettering.net> | 2007-08-11 19:08:06 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2007-08-11 19:08:06 +0000 |
| commit | 50e014e7a9bc1742d5a9f37f7fa057a6a23a1d6c (patch) | |
| tree | 13f39e9e01556531e433a887086a0c05aa3ee7e7 /src/pulsecore/sink.c | |
| parent | a3cd8002b524ab323b964847fc0daa08e85f1bc8 (diff) | |
use single array for storing pa_core hook lists, add sink state changed hook, drop NO_HOOKS flags for sink inputs/source outputs, listen for resume events in module-suspend-on-idle.c
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1640 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/pulsecore/sink.c')
| -rw-r--r-- | src/pulsecore/sink.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c index 905fe3ff..929542cc 100644 --- a/src/pulsecore/sink.c +++ b/src/pulsecore/sink.c @@ -80,9 +80,6 @@ pa_sink* pa_sink_new( pa_return_null_if_fail(!driver || pa_utf8_valid(driver)); pa_return_null_if_fail(name && pa_utf8_valid(name) && *name); - if (pa_hook_fire(&core->hook_sink_new, NULL) < 0) /* FIXME */ - return NULL; - s = pa_msgobject_new(pa_sink); if (!(name = pa_namereg_register(core, name, PA_NAMEREG_SINK, s, fail))) { @@ -149,7 +146,7 @@ pa_sink* pa_sink_new( pa_subscription_post(core, PA_SUBSCRIPTION_EVENT_SINK | PA_SUBSCRIPTION_EVENT_NEW, s->index); - pa_hook_fire(&core->hook_sink_new_post, s); + pa_hook_fire(&core->hooks[PA_CORE_HOOK_SINK_NEW_POST], s); return s; } @@ -170,6 +167,8 @@ static int sink_set_state(pa_sink *s, pa_sink_state_t state) { return -1; s->state = state; + + pa_hook_fire(&s->core->hooks[PA_CORE_HOOK_SINK_STATE_CHANGED], s); return 0; } @@ -179,7 +178,7 @@ void pa_sink_disconnect(pa_sink* s) { pa_assert(s); pa_return_if_fail(s->state != PA_SINK_DISCONNECTED); - pa_hook_fire(&s->core->hook_sink_disconnect, s); + pa_hook_fire(&s->core->hooks[PA_CORE_HOOK_SINK_DISCONNECT], s); pa_namereg_unregister(s->core, s->name); pa_idxset_remove_by_data(s->core->sinks, s, NULL); @@ -204,7 +203,7 @@ void pa_sink_disconnect(pa_sink* s) { pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SINK | PA_SUBSCRIPTION_EVENT_REMOVE, s->index); - pa_hook_fire(&s->core->hook_sink_disconnect_post, s); + pa_hook_fire(&s->core->hooks[PA_CORE_HOOK_SINK_DISCONNECT_POST], s); } static void sink_free(pa_object *o) { |