Merge most of elmarco/rtclock2

[pulseaudio] / src / modules / module-combine.c

diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c
index 757dbda43960baa569dbdba5c76a51d2480af73b..d50e59aeb1d94047cf211a20dcb5ef3ba74d3ace 100644 (file)
--- a/src/modules/module-combine.c
+++ b/src/modules/module-combine.c
@@ -278,7 +278,6 @@ static void thread_func(void *userdata) {
         pa_make_realtime(u->core->realtime_priority+1);
 
     pa_thread_mq_install(&u->thread_mq);
-    pa_rtpoll_install(u->rtpoll);
 
     u->thread_info.timestamp = pa_rtclock_now();
     u->thread_info.in_null_mode = FALSE;