summaryrefslogtreecommitdiffstats
path: root/src/pulse/client-conf.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-08-19 01:18:30 +0000
committerLennart Poettering <lennart@poettering.net>2006-08-19 01:18:30 +0000
commitd785b8fa877b829d9d38082968b35117f7c9d9ec (patch)
tree9a75397b4dbb0bae8cc578c43c0d71c890d627ae /src/pulse/client-conf.c
parent206ac6f3ee4e849a80d3449b9e0f7e3d794cac27 (diff)
add new "disable-shm" option to client.conf
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1284 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/pulse/client-conf.c')
-rw-r--r--src/pulse/client-conf.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/pulse/client-conf.c b/src/pulse/client-conf.c
index 619b11c3..5cd7e3ed 100644
--- a/src/pulse/client-conf.c
+++ b/src/pulse/client-conf.c
@@ -62,6 +62,7 @@ static const pa_client_conf default_conf = {
.default_source = NULL,
.default_server = NULL,
.autospawn = 0,
+ .disable_shm = 0,
.cookie_file = NULL,
.cookie_valid = 0,
};
@@ -100,6 +101,7 @@ int pa_client_conf_load(pa_client_conf *c, const char *filename) {
{ "default-server", pa_config_parse_string, NULL },
{ "autospawn", pa_config_parse_bool, NULL },
{ "cookie-file", pa_config_parse_string, NULL },
+ { "disable-shm", pa_config_parse_bool, NULL },
{ NULL, NULL, NULL },
};
@@ -110,6 +112,7 @@ int pa_client_conf_load(pa_client_conf *c, const char *filename) {
table[4].data = &c->default_server;
table[5].data = &c->autospawn;
table[6].data = &c->cookie_file;
+ table[7].data = &c->disable_shm;
f = filename ?
fopen((fn = pa_xstrdup(filename)), "r") :