summaryrefslogtreecommitdiffstats
path: root/src/modules/module-combine.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-09-11 13:15:39 +0000
committerLennart Poettering <lennart@poettering.net>2007-09-11 13:15:39 +0000
commit391d09cd6e8d47ad8255736be5cb512b04843ed1 (patch)
treed5f66e0e8476ed5d3f21791c80a4a8fadf7bdef6 /src/modules/module-combine.c
parent597a1c4e82f2bb84e983d0cbb9be7e79c5607c00 (diff)
add 'wait' parameter to pa_rtpoll_run(), if zero pa_rtpoll_runn will only update the struct pollfd but not wait for an event
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1803 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/modules/module-combine.c')
-rw-r--r--src/modules/module-combine.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c
index 3e56bc67..390b6e5c 100644
--- a/src/modules/module-combine.c
+++ b/src/modules/module-combine.c
@@ -268,7 +268,7 @@ static void thread_func(void *userdata) {
continue;
/* Hmm, nothing to do. Let's sleep */
- if (pa_rtpoll_run(u->rtpoll) < 0) {
+ if (pa_rtpoll_run(u->rtpoll, 1) < 0) {
pa_log("poll() failed: %s", pa_cstrerror(errno));
goto fail;
}