From 5babbaafb26ac4f83db0d8bca53006a843472b8f Mon Sep 17 00:00:00 2001
From: Tanu Kaskinen <tanuk@iki.fi>
Date: Fri, 12 Jun 2009 07:16:05 +0300
Subject: daemon: Implement the DBus server lookup service.

---
 src/pulse/client-conf.c  | 3 +++
 src/pulse/client-conf.h  | 3 ++-
 src/pulse/client.conf.in | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/pulse')

diff --git a/src/pulse/client-conf.c b/src/pulse/client-conf.c
index 940d0b67..8eab1094 100644
--- a/src/pulse/client-conf.c
+++ b/src/pulse/client-conf.c
@@ -57,6 +57,7 @@ static const pa_client_conf default_conf = {
     .default_sink = NULL,
     .default_source = NULL,
     .default_server = NULL,
+    .default_dbus_server = NULL,
     .autospawn = TRUE,
     .disable_shm = FALSE,
     .cookie_file = NULL,
@@ -81,6 +82,7 @@ void pa_client_conf_free(pa_client_conf *c) {
     pa_xfree(c->default_sink);
     pa_xfree(c->default_source);
     pa_xfree(c->default_server);
+    pa_xfree(c->default_dbus_server);
     pa_xfree(c->cookie_file);
     pa_xfree(c);
 }
@@ -97,6 +99,7 @@ int pa_client_conf_load(pa_client_conf *c, const char *filename) {
         { "default-sink",           pa_config_parse_string,  &c->default_sink, NULL },
         { "default-source",         pa_config_parse_string,  &c->default_source, NULL },
         { "default-server",         pa_config_parse_string,  &c->default_server, NULL },
+        { "default-dbus-server",    pa_config_parse_string,  &c->default_dbus_server, NULL },
         { "autospawn",              pa_config_parse_bool,    &c->autospawn, NULL },
         { "cookie-file",            pa_config_parse_string,  &c->cookie_file, NULL },
         { "disable-shm",            pa_config_parse_bool,    &c->disable_shm, NULL },
diff --git a/src/pulse/client-conf.h b/src/pulse/client-conf.h
index ab97dc6a..618216f4 100644
--- a/src/pulse/client-conf.h
+++ b/src/pulse/client-conf.h
@@ -22,12 +22,13 @@
   USA.
 ***/
 
+#include <pulsecore/macro.h>
 #include <pulsecore/native-common.h>
 
 /* A structure containing configuration data for PulseAudio clients. */
 
 typedef struct pa_client_conf {
-    char *daemon_binary, *extra_arguments, *default_sink, *default_source, *default_server, *cookie_file;
+    char *daemon_binary, *extra_arguments, *default_sink, *default_source, *default_server, *default_dbus_server, *cookie_file;
     pa_bool_t autospawn, disable_shm;
     uint8_t cookie[PA_NATIVE_COOKIE_LENGTH];
     pa_bool_t cookie_valid; /* non-zero, when cookie is valid */
diff --git a/src/pulse/client.conf.in b/src/pulse/client.conf.in
index 579bcc20..3340b0b2 100644
--- a/src/pulse/client.conf.in
+++ b/src/pulse/client.conf.in
@@ -22,6 +22,7 @@
 ; default-sink =
 ; default-source =
 ; default-server =
+; default-dbus-server =
 
 ; autospawn = yes
 ; daemon-binary = @PA_BINARY@
-- 
cgit