From 964bdfd1e8255b57e9d22cd22b3784e2fc79b905 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
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/module-x11-bell.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'polyp/module-x11-bell.c')

diff --git a/polyp/module-x11-bell.c b/polyp/module-x11-bell.c
index 2cf76099..5449e944 100644
--- a/polyp/module-x11-bell.c
+++ b/polyp/module-x11-bell.c
@@ -14,7 +14,7 @@
 #include "namereg.h"
 
 struct x11_source {
-    void *io_source;
+    struct pa_io_event *io_event;
     struct x11_source *next;
 };
 
@@ -52,7 +52,7 @@ static int ring_bell(struct userdata *u, int percent) {
     return 0;
 }
 
-static void io_callback(struct pa_mainloop_api*a, void *id, int fd, enum pa_mainloop_api_io_events events, void *userdata) {
+static void io_callback(struct pa_mainloop_api*a, struct pa_io_event *e, int fd, enum pa_io_event_flags f, void *userdata) {
     struct userdata *u = userdata;
     assert(u);
     
@@ -77,8 +77,8 @@ static void new_io_source(struct userdata *u, int fd) {
     struct x11_source *s;
 
     s = pa_xmalloc(sizeof(struct x11_source));
-    s->io_source = u->core->mainloop->source_io(u->core->mainloop, fd, PA_MAINLOOP_API_IO_EVENT_INPUT, io_callback, u);
-    assert(s->io_source);
+    s->io_event = u->core->mainloop->io_new(u->core->mainloop, fd, PA_IO_EVENT_INPUT, io_callback, u);
+    assert(s->io_event);
     s->next = u->x11_sources;
     u->x11_sources = s;
 }
@@ -149,7 +149,7 @@ void pa_module_done(struct pa_core *c, struct pa_module*m) {
     while (u->x11_sources) {
         struct x11_source *s = u->x11_sources;
         u->x11_sources = u->x11_sources->next;
-        c->mainloop->cancel_io(c->mainloop, s->io_source);
+        c->mainloop->io_free(s->io_event);
         pa_xfree(s);
     }
 
-- 
cgit