From 964bdfd1e8255b57e9d22cd22b3784e2fc79b905 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 5 Aug 2004 19:53:57 +0000 Subject: add initial glib mainloop adapter clean up mainloop API git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@105 fefdeb5f-60dc-0310-8127-8f9354f1896f --- polyp/mainloop-api.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) (limited to 'polyp/mainloop-api.c') diff --git a/polyp/mainloop-api.c b/polyp/mainloop-api.c index 8b4e09ac..952fce0a 100644 --- a/polyp/mainloop-api.c +++ b/polyp/mainloop-api.c @@ -30,32 +30,38 @@ #include "xmalloc.h" struct once_info { - void (*callback)(void *userdata); + void (*callback)(struct pa_mainloop_api*m, void *userdata); void *userdata; }; -static void once_callback(struct pa_mainloop_api *api, void *id, void *userdata) { +static void once_callback(struct pa_mainloop_api *m, struct pa_defer_event *e, void *userdata) { struct once_info *i = userdata; - assert(api && i && i->callback); - i->callback(i->userdata); - assert(api->cancel_fixed); - api->cancel_fixed(api, id); + assert(m && i && i->callback); + + i->callback(m, i->userdata); + + assert(m->defer_free); + m->defer_free(e); +} + +static void free_callback(struct pa_mainloop_api *m, struct pa_defer_event *e, void *userdata) { + struct once_info *i = userdata; + assert(m && i); pa_xfree(i); } -void pa_mainloop_api_once(struct pa_mainloop_api* api, void (*callback)(void *userdata), void *userdata) { +void pa_mainloop_api_once(struct pa_mainloop_api* m, void (*callback)(struct pa_mainloop_api *m, void *userdata), void *userdata) { struct once_info *i; - void *id; - assert(api && callback); + struct pa_defer_event *e; + assert(m && callback); i = pa_xmalloc(sizeof(struct once_info)); i->callback = callback; i->userdata = userdata; - assert(api->source_fixed); - id = api->source_fixed(api, once_callback, i); - assert(id); - - /* Note: if the mainloop is destroyed before once_callback() was called, some memory is leaked. */ + assert(m->defer_new); + e = m->defer_new(m, once_callback, i); + assert(e); + m->defer_set_destroy(e, free_callback); } -- cgit