From 93f7bcb71bf92fedf88fb080fa19dfec3d2e70f7 Mon Sep 17 00:00:00 2001 From: Koichiro IWAO Date: Thu, 18 Feb 2016 00:18:47 +0900 Subject: 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. --- sesman/chansrv/pulse/module-xrdp-sink.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'sesman/chansrv/pulse/module-xrdp-sink.c') diff --git a/sesman/chansrv/pulse/module-xrdp-sink.c b/sesman/chansrv/pulse/module-xrdp-sink.c index f56644b9..79cd7b27 100644 --- a/sesman/chansrv/pulse/module-xrdp-sink.c +++ b/sesman/chansrv/pulse/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; } -- cgit v1.2.3