diff options
author | Lennart Poettering <lennart@poettering.net> | 2006-08-13 16:13:36 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2006-08-13 16:13:36 +0000 |
commit | db3f561ec4d6fe7b6deedff45802a5efd3ba4013 (patch) | |
tree | 15bd1b631288f372592a7448486bb18e76fa24bd /src/pulsecore/hook-list.h | |
parent | 281125c72767713d6294ac7094f3bf7bde47a1e3 (diff) |
rework hook list stuff once again: change the callback prototype to recieve three data pointers: one to the data for the hook, once for the slot and once for the call
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1235 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/pulsecore/hook-list.h')
-rw-r--r-- | src/pulsecore/hook-list.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/pulsecore/hook-list.h b/src/pulsecore/hook-list.h index e016ff0c..67e5d1ae 100644 --- a/src/pulsecore/hook-list.h +++ b/src/pulsecore/hook-list.h @@ -35,13 +35,16 @@ typedef enum pa_hook_result { PA_HOOK_CANCEL = -1 } pa_hook_result_t; -typedef pa_hook_result_t (*pa_hook_cb_t)(void *data, void *userdata); +typedef pa_hook_result_t (*pa_hook_cb_t)( + void *hook_data, + void *call_data, + void *slot_data); struct pa_hook_slot { int dead; pa_hook *hook; pa_hook_cb_t callback; - void *userdata; + void *data; PA_LLIST_FIELDS(pa_hook_slot); }; @@ -49,12 +52,14 @@ struct pa_hook { PA_LLIST_HEAD(pa_hook_slot, slots); pa_hook_slot *last; int firing, n_dead; + + void *data; }; -void pa_hook_init(pa_hook *hook); +void pa_hook_init(pa_hook *hook, void *data); void pa_hook_free(pa_hook *hook); -pa_hook_slot* pa_hook_connect(pa_hook *hook, pa_hook_cb_t, void *userdata); +pa_hook_slot* pa_hook_connect(pa_hook *hook, pa_hook_cb_t, void *data); void pa_hook_slot_free(pa_hook_slot *slot); pa_hook_result_t pa_hook_fire(pa_hook *hook, void *data); |