summaryrefslogtreecommitdiffstats
path: root/src/daemon/daemon-conf.h
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-10-07 03:39:30 +0200
committerLennart Poettering <lennart@poettering.net>2009-10-07 03:39:30 +0200
commit692ce73899285c6ed07e93084a5f830a9a8effcc (patch)
treefb57aacd95086eb35787f902353857daf3f8fe95 /src/daemon/daemon-conf.h
parentb3592a160f0d2a28605048a81c0261bf7c45acbb (diff)
parent019331d25b6af107fb8cacc3ada552e7567a64bf (diff)
Merge remote branch 'tanuk/dbus-work'
Diffstat (limited to 'src/daemon/daemon-conf.h')
-rw-r--r--src/daemon/daemon-conf.h3
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);