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-input.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-input.c')
| -rw-r--r-- | src/pulsecore/sink-input.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c index d1bf0acc..77b95feb 100644 --- a/src/pulsecore/sink-input.c +++ b/src/pulsecore/sink-input.c @@ -98,9 +98,8 @@ pa_sink_input* pa_sink_input_new( pa_assert(core); pa_assert(data); - if (!(flags & PA_SINK_INPUT_NO_HOOKS)) - if (pa_hook_fire(&core->hook_sink_input_new, data) < 0) - return NULL; + if (pa_hook_fire(&core->hooks[PA_CORE_HOOK_SINK_INPUT_NEW], data) < 0) + return NULL; pa_return_null_if_fail(!data->driver || pa_utf8_valid(data->driver)); pa_return_null_if_fail(!data->name || pa_utf8_valid(data->name)); @@ -249,7 +248,7 @@ void pa_sink_input_disconnect(pa_sink_input *i) { pa_assert(i); pa_return_if_fail(i->state != PA_SINK_INPUT_DISCONNECTED); - pa_hook_fire(&i->sink->core->hook_sink_input_disconnect, i); + pa_hook_fire(&i->sink->core->hooks[PA_CORE_HOOK_SINK_INPUT_DISCONNECT], i); if (i->sync_prev) i->sync_prev->sync_next = i->sync_next; @@ -273,7 +272,7 @@ void pa_sink_input_disconnect(pa_sink_input *i) { i->get_latency = NULL; i->underrun = NULL; - pa_hook_fire(&i->sink->core->hook_sink_input_disconnect_post, i); + pa_hook_fire(&i->sink->core->hooks[PA_CORE_HOOK_SINK_INPUT_DISCONNECT_POST], i); i->sink = NULL; pa_sink_input_unref(i); } @@ -313,7 +312,7 @@ void pa_sink_input_put(pa_sink_input *i) { pa_sink_update_status(i->sink); pa_subscription_post(i->sink->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_NEW, i->index); - pa_hook_fire(&i->sink->core->hook_sink_input_new_post, i); + pa_hook_fire(&i->sink->core->hooks[PA_CORE_HOOK_SINK_INPUT_PUT], i); } void pa_sink_input_kill(pa_sink_input*i) { |