Merge pull request #326 from metalefty/pulseaudio-6.0

pulse: fix build pulseaudio 6.0 or higher
8 years ago · f53b3bb737
parent f100036cd9 93f7bcb71b
commit f53b3bb737
2 changed files with 10 additions and 1 deletions
--- 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;
        }

--- a/sesman/chansrv/pulse/module-xrdp-source.c
+++ b/sesman/chansrv/pulse/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;