diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2009-06-29 18:35:06 +0300 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-06-29 18:35:06 +0300 |
| commit | 0bc538b08ca5c4efea86700cb6c4685da3f34345 (patch) | |
| tree | e5b0fe4b967ecb7e9251faf21904bbbe825aaab7 /src/pulse/internal.h | |
| parent | b152f3a052eca7225870a7dc4d8a719bee107f0f (diff) | |
| parent | 2654eb7781ddcfe53064745bbad77bffe5c8eada (diff) | |
Merge branch 'master' into dbus-work
Conflicts:
src/daemon/daemon-conf.c
src/daemon/daemon-conf.h
src/daemon/main.c
src/pulsecore/dbus-util.h
Diffstat (limited to 'src/pulse/internal.h')
| -rw-r--r-- | src/pulse/internal.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/pulse/internal.h b/src/pulse/internal.h index 28a989b3..ec2da85b 100644 --- a/src/pulse/internal.h +++ b/src/pulse/internal.h @@ -89,6 +89,7 @@ struct pa_context { pa_bool_t server_specified:1; pa_bool_t no_fail:1; pa_bool_t do_autospawn:1; + pa_bool_t use_rtclock:1; pa_spawn_api spawn_api; pa_strlist *server_list; @@ -279,4 +280,6 @@ pa_tagstruct *pa_tagstruct_command(pa_context *c, uint32_t command, uint32_t *ta void pa_ext_stream_restore_command(pa_context *c, uint32_t tag, pa_tagstruct *t); +pa_bool_t pa_mainloop_is_our_api(pa_mainloop_api*m); + #endif |