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/pulse/client-conf.c | |
| parent | 94aa9097f4ded68623160d754a4bf2632b8efc79 (diff) | |
| parent | 8ec304d2d1e956cc3f5f35437ac4fe580b36f004 (diff) | |
Merge branch 'master' of git://0pointer.de/pulseaudio
Diffstat (limited to 'src/pulse/client-conf.c')
| -rw-r--r-- | src/pulse/client-conf.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/pulse/client-conf.c b/src/pulse/client-conf.c index 4aa4ba1f..62c06f6a 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 }, |