diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-06-22 22:36:31 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-06-22 22:36:31 +0200 |
| commit | 374efbded48d969cdc21997427a5f1790b4804a4 (patch) | |
| tree | eb9b587d031e117f83e5a4ccd646932ec1fb95a5 /src/modules/module-combine.c | |
| parent | aa2570c2ba8f1ff3cbbcb56607f0d013351916ff (diff) | |
| parent | 32e2cd6d3216f780c4cffed0f8eb3c30f2c8d732 (diff) | |
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
Diffstat (limited to 'src/modules/module-combine.c')
| -rw-r--r-- | src/modules/module-combine.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c index 725faa0c..cd3118d7 100644 --- a/src/modules/module-combine.c +++ b/src/modules/module-combine.c @@ -280,7 +280,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_usec(); u->thread_info.in_null_mode = FALSE; |