diff options
| author | jsorg71 <jay.sorg@gmail.com> | 2016-02-23 23:19:59 -0800 |
|---|---|---|
| committer | jsorg71 <jay.sorg@gmail.com> | 2016-02-23 23:19:59 -0800 |
| commit | f53b3bb737905ea9c53dc9b18594cfe78b077866 (patch) | |
| tree | 2b65c209983ab957cc6a9a4f6ded21e30d870b89 /sesman | |
| parent | f100036cd9e2b65fd8fdc315b176bcca4dd09a51 (diff) | |
| parent | 93f7bcb71bf92fedf88fb080fa19dfec3d2e70f7 (diff) | |
| download | xrdp-proprietary-f53b3bb737905ea9c53dc9b18594cfe78b077866.tar.gz xrdp-proprietary-f53b3bb737905ea9c53dc9b18594cfe78b077866.zip | |
Merge pull request #326 from metalefty/pulseaudio-6.0
pulse: fix build pulseaudio 6.0 or higher
Diffstat (limited to 'sesman')
| -rw-r--r-- | sesman/chansrv/pulse/module-xrdp-sink.c | 4 | ||||
| -rw-r--r-- | sesman/chansrv/pulse/module-xrdp-source.c | 7 |
2 files changed, 10 insertions, 1 deletions
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; } diff --git a/sesman/chansrv/pulse/module-xrdp-source.c b/sesman/chansrv/pulse/module-xrdp-source.c index 52409606..78124f9d 100644 --- 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; |