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/protocol-simple.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'polyp/protocol-simple.c')

diff --git a/polyp/protocol-simple.c b/polyp/protocol-simple.c
index 4b3b1513..a95b356c 100644
--- a/polyp/protocol-simple.c
+++ b/polyp/protocol-simple.c
@@ -45,7 +45,7 @@ struct connection {
     struct pa_source_output *source_output;
     struct pa_client *client;
     struct pa_memblockq *input_memblockq, *output_memblockq;
-    void *fixed_source;
+    struct pa_defer_event *defer_event;
 
     struct {
         struct pa_memblock *current_memblock;
@@ -91,8 +91,8 @@ static void connection_free(struct connection *c) {
         pa_memblockq_free(c->input_memblockq);
     if (c->output_memblockq)
         pa_memblockq_free(c->output_memblockq);
-    if (c->fixed_source)
-        c->protocol->core->mainloop->cancel_fixed(c->protocol->core->mainloop, c->fixed_source);
+    if (c->defer_event)
+        c->protocol->core->mainloop->defer_free(c->defer_event);
     pa_xfree(c);
 }
 
@@ -169,8 +169,8 @@ static int do_write(struct connection *c) {
 static void do_work(struct connection *c) {
     assert(c);
 
-    assert(c->protocol && c->protocol->core && c->protocol->core->mainloop && c->protocol->core->mainloop->enable_fixed);
-    c->protocol->core->mainloop->enable_fixed(c->protocol->core->mainloop, c->fixed_source, 0);
+    assert(c->protocol && c->protocol->core && c->protocol->core->mainloop && c->protocol->core->mainloop->defer_enable);
+    c->protocol->core->mainloop->defer_enable(c->defer_event, 0);
 
     if (pa_iochannel_is_hungup(c->io))
         goto fail;
@@ -209,8 +209,8 @@ static void sink_input_drop_cb(struct pa_sink_input *i, size_t length) {
     pa_memblockq_drop(c->input_memblockq, length);
 
     /* do something */
-    assert(c->protocol && c->protocol->core && c->protocol->core->mainloop && c->protocol->core->mainloop->enable_fixed);
-    c->protocol->core->mainloop->enable_fixed(c->protocol->core->mainloop, c->fixed_source, 1);
+    assert(c->protocol && c->protocol->core && c->protocol->core->mainloop && c->protocol->core->mainloop->defer_enable);
+    c->protocol->core->mainloop->defer_enable(c->defer_event, 1);
 }
 
 static void sink_input_kill_cb(struct pa_sink_input *i) {
@@ -234,8 +234,8 @@ static void source_output_push_cb(struct pa_source_output *o, const struct pa_me
     pa_memblockq_push(c->output_memblockq, chunk, 0);
 
     /* do something */
-    assert(c->protocol && c->protocol->core && c->protocol->core->mainloop && c->protocol->core->mainloop->enable_fixed);
-    c->protocol->core->mainloop->enable_fixed(c->protocol->core->mainloop, c->fixed_source, 1);
+    assert(c->protocol && c->protocol->core && c->protocol->core->mainloop && c->protocol->core->mainloop->defer_enable);
+    c->protocol->core->mainloop->defer_enable(c->defer_event, 1);
 }
 
 static void source_output_kill_cb(struct pa_source_output *o) {
@@ -261,9 +261,9 @@ static void io_callback(struct pa_iochannel*io, void *userdata) {
 
 /*** fixed callback ***/
 
-static void fixed_callback(struct pa_mainloop_api*a, void *id, void *userdata) {
+static void defer_callback(struct pa_mainloop_api*a, struct pa_defer_event *e, void *userdata) {
     struct connection *c = userdata;
-    assert(a && c && c->fixed_source == id);
+    assert(a && c && c->defer_event == e);
 
     do_work(c);
 }
@@ -280,7 +280,7 @@ static void on_connection(struct pa_socket_server*s, struct pa_iochannel *io, vo
     c->io = io;
     c->sink_input = NULL;
     c->source_output = NULL;
-    c->fixed_source = NULL;
+    c->defer_event = NULL;
     c->input_memblockq = c->output_memblockq = NULL;
     c->protocol = p;
     c->playback.current_memblock = NULL;
@@ -353,9 +353,9 @@ static void on_connection(struct pa_socket_server*s, struct pa_iochannel *io, vo
     pa_iochannel_set_callback(c->io, io_callback, c);
     pa_idxset_put(p->connections, c, NULL);
 
-    c->fixed_source = p->core->mainloop->source_fixed(p->core->mainloop, fixed_callback, c);
-    assert(c->fixed_source);
-    p->core->mainloop->enable_fixed(p->core->mainloop, c->fixed_source, 0);
+    c->defer_event = p->core->mainloop->defer_new(p->core->mainloop, defer_callback, c);
+    assert(c->defer_event);
+    p->core->mainloop->defer_enable(c->defer_event, 0);
     
     return;
     
-- 
cgit