diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2009-08-16 21:25:48 +0300 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-08-16 21:25:48 +0300 |
| commit | bcaba0b1b43d6a1b32aadfa98860f40b2c93e136 (patch) | |
| tree | 6bd0d60a8fa822bfd688b90d062d0f73eee2e47e /src/modules/reserve-wrap.c | |
| parent | 2bb3eef414f80189cf6af6cd66c519630e4c0a43 (diff) | |
| parent | 01e4b61a910afdd21f860fadbe98075735c2bf51 (diff) | |
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work
Conflicts:
src/Makefile.am
src/daemon/daemon-conf.c
src/daemon/daemon.conf.in
src/modules/module-stream-restore.c
src/pulse/client-conf.c
src/pulsecore/namereg.c
Diffstat (limited to 'src/modules/reserve-wrap.c')
| -rw-r--r-- | src/modules/reserve-wrap.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/modules/reserve-wrap.c b/src/modules/reserve-wrap.c index 07b592d3..6086fc99 100644 --- a/src/modules/reserve-wrap.c +++ b/src/modules/reserve-wrap.c @@ -336,5 +336,9 @@ pa_bool_t pa_reserve_monitor_wrapper_busy(pa_reserve_monitor_wrapper *w) { pa_assert(PA_REFCNT_VALUE(w) >= 1); +#ifdef HAVE_DBUS return rm_busy(w->monitor) > 0; +#else + return FALSE; +#endif } |