summaryrefslogtreecommitdiffstats
path: root/polyp/iochannel.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2004-11-17 00:05:25 +0000
committerLennart Poettering <lennart@poettering.net>2004-11-17 00:05:25 +0000
commit0a2bbc528b7865b08139155e0316738a717c4e42 (patch)
tree99166840892bb315fe109436093876386adac51d /polyp/iochannel.c
parentf5f6605254d17c5bc06b8c1ec98e8ee09009af10 (diff)
* some commenting work
* add new field "read_only" to memory blocks * add new API function pa_context_get_server() * filter capture data through mcalign on client * make module-tunnel use pa_socket_client_new_string() instead of using pa_resolve_server() directly. * remove pa_resolve_server() * remove debug.h and replace it by a macro definition on the gcc command line * some strbuf cleanups * small fixes in pa_stream for cleanup when server dies * new CLI command "load-sample-dir-lazy" * send FQDN as part of server info * rework mcalign, this time with memory block merging * fix iochannel cleanup when connection dies * check getaddrinfo() results git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@286 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'polyp/iochannel.c')
-rw-r--r--polyp/iochannel.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/polyp/iochannel.c b/polyp/iochannel.c
index b93860a5..f174afd0 100644
--- a/polyp/iochannel.c
+++ b/polyp/iochannel.c
@@ -82,6 +82,9 @@ static void callback(struct pa_mainloop_api* m, struct pa_io_event *e, int fd, e
if (e == io->input_event) {
io->mainloop->io_free(io->input_event);
io->input_event = NULL;
+
+ if (io->output_event == e)
+ io->output_event = NULL;
}
if (e == io->output_event) {