From a67966d034c14e05814b28ef31530c06f7f30404 Mon Sep 17 00:00:00 2001 From: Koichiro IWAO Date: Thu, 18 Feb 2016 00:18:47 +0900 Subject: [PATCH] pulse: fix build pulseaudio 6.0 or higher Discovered in #321. The number of argument for pa_rtpoll_run have been changed since 6.0. >=6.0 : int pa_rtpoll_run(pa_rtpoll *f); <6.0 : int pa_rtpoll_run(pa_rtpoll *f, bool wait); Check pulseaudio version by PA_CHECK_VERSION macro introduced since pulseaudio 0.9.16. In case PA_CHECK_VERSION is not defined, pa_rtpoll_run takes 2 arguments. --- module-xrdp-sink.c | 4 ++++ module-xrdp-source.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/module-xrdp-sink.c b/module-xrdp-sink.c index f56644b..79cd7b2 100644 --- a/module-xrdp-sink.c +++ b/module-xrdp-sink.c @@ -440,7 +440,11 @@ static void thread_func(void *userdata) { pa_rtpoll_set_timer_disabled(u->rtpoll); } +#if defined(PA_CHECK_VERSION) && PA_CHECK_VERSION(6, 0, 0) + if ((ret = pa_rtpoll_run(u->rtpoll)) < 0) { +#else if ((ret = pa_rtpoll_run(u->rtpoll, TRUE)) < 0) { +#endif goto fail; } diff --git a/module-xrdp-source.c b/module-xrdp-source.c index 5240960..78124f9 100644 --- a/module-xrdp-source.c +++ b/module-xrdp-source.c @@ -339,8 +339,13 @@ static void thread_func(void *userdata) { } /* Hmm, nothing to do. Let's sleep */ - if ((ret = pa_rtpoll_run(u->rtpoll, TRUE)) < 0) +#if defined(PA_CHECK_VERSION) && PA_CHECK_VERSION(6, 0, 0) + if ((ret = pa_rtpoll_run(u->rtpoll)) < 0) { +#else + if ((ret = pa_rtpoll_run(u->rtpoll, TRUE)) < 0) { +#endif goto fail; + } if (ret == 0) goto finish;