diff options
| author | Daniel Mack <daniel@caiaq.de> | 2009-10-08 14:19:47 +0800 |
|---|---|---|
| committer | Daniel Mack <daniel@caiaq.de> | 2009-10-08 14:19:47 +0800 |
| commit | 0b388bff522f689fdb4d98529a39f3701db57c08 (patch) | |
| tree | 837b4fb0993078a708dfddb5801220e44a711d32 /src/daemon/daemon-conf.h | |
| parent | 94aa9097f4ded68623160d754a4bf2632b8efc79 (diff) | |
| parent | 8ec304d2d1e956cc3f5f35437ac4fe580b36f004 (diff) | |
Merge branch 'master' of git://0pointer.de/pulseaudio
Diffstat (limited to 'src/daemon/daemon-conf.h')
| -rw-r--r-- | src/daemon/daemon-conf.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/daemon/daemon-conf.h b/src/daemon/daemon-conf.h index dd69e048..41c3c4b7 100644 --- a/src/daemon/daemon-conf.h +++ b/src/daemon/daemon-conf.h @@ -28,6 +28,7 @@ #include <pulsecore/log.h> #include <pulsecore/macro.h> +#include <pulsecore/core.h> #include <pulsecore/core-util.h> #ifdef HAVE_SYS_RESOURCE_H @@ -75,6 +76,7 @@ typedef struct pa_daemon_conf { log_time, flat_volumes, lock_memory; + pa_server_type_t local_server_type; int exit_idle_time, scache_idle_time, auto_log_target, @@ -152,6 +154,7 @@ int pa_daemon_conf_env(pa_daemon_conf *c); int pa_daemon_conf_set_log_target(pa_daemon_conf *c, const char *string); int pa_daemon_conf_set_log_level(pa_daemon_conf *c, const char *string); int pa_daemon_conf_set_resample_method(pa_daemon_conf *c, const char *string); +int pa_daemon_conf_set_local_server_type(pa_daemon_conf *c, const char *string); const char *pa_daemon_conf_get_default_script_file(pa_daemon_conf *c); FILE *pa_daemon_conf_open_default_script_file(pa_daemon_conf *c); |