From b24546bedee168778a7aef11200dfb0378dfae43 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 15 Jun 2004 17:05:03 +0000
Subject: cleanup

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@18 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/module-pipe-sink.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/module-pipe-sink.c')

diff --git a/src/module-pipe-sink.c b/src/module-pipe-sink.c
index e63a7a86..c0a903e9 100644
--- a/src/module-pipe-sink.c
+++ b/src/module-pipe-sink.c
@@ -52,9 +52,9 @@ static void do_write(struct userdata *u) {
     }
 }
 
-static void notify_callback(struct sink*s, void *userdata) {
-    struct userdata *u = userdata;
-    assert(u);
+static void notify_cb(struct sink*s) {
+    struct userdata *u = s->userdata;
+    assert(s && u);
 
     if (iochannel_is_writable(u->io))
         mainloop_source_enable(u->mainloop_source, 1);
@@ -77,7 +77,7 @@ int module_init(struct core *c, struct module*m) {
     struct stat st;
     char *p;
     int fd = -1;
-    const static struct sample_spec ss = {
+    static const struct sample_spec ss = {
         .format = SAMPLE_S16NE,
         .rate = 44100,
         .channels = 2,
@@ -110,7 +110,8 @@ int module_init(struct core *c, struct module*m) {
     u->core = c;
     u->sink = sink_new(c, "fifo", &ss);
     assert(u->sink);
-    sink_set_notify_callback(u->sink, notify_callback, u);
+    u->sink->notify = notify_cb;
+    u->sink->userdata = u;
 
     u->io = iochannel_new(c->mainloop, -1, fd);
     assert(u->io);
-- 
cgit