From 722c2c8c8785d215ec3ec8757168b82c9600f4a3 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 4 Jul 2004 17:40:15 +0000 Subject: add kill_* and default_* commands to CLI make module-cli unload itself on EOF clean up stdio usage add sink pointer to monitor sources git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@50 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/ioline.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/ioline.c') diff --git a/src/ioline.c b/src/ioline.c index ab7cb517..86ab5720 100644 --- a/src/ioline.c +++ b/src/ioline.c @@ -146,14 +146,14 @@ static int do_read(struct pa_ioline *l) { p = l->rbuf+l->rbuf_index; m = strlen(p); - if (l->callback) - l->callback(l, p, l->userdata); - l->rbuf_index += m+1; l->rbuf_valid_length -= m+1; if (l->rbuf_valid_length == 0) l->rbuf_index = 0; + + if (l->callback) + l->callback(l, p, l->userdata); } return 0; @@ -180,10 +180,10 @@ static void io_callback(struct pa_iochannel*io, void *userdata) { struct pa_ioline *l = userdata; assert(io && l); - if (!l->dead && do_read(l) < 0) + if (!l->dead && do_write(l) < 0) goto fail; - if (!l->dead && do_write(l) < 0) + if (!l->dead && do_read(l) < 0) goto fail; return; -- cgit