[pulseaudio-commits] r1284 - in /trunk/src/pulse: client-conf.c client-conf.h context.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Sat Aug 19 03:18:30 2006
New Revision: 1284

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=1284&root=pulseaudio&view=rev
Log:
add new "disable-shm" option to client.conf

Modified:
    trunk/src/pulse/client-conf.c
    trunk/src/pulse/client-conf.h
    trunk/src/pulse/context.c

Modified: trunk/src/pulse/client-conf.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/client-conf.c?rev=1284&root=pulseaudio&r1=1283&r2=1284&view=diff
==============================================================================
--- trunk/src/pulse/client-conf.c (original)
+++ trunk/src/pulse/client-conf.c Sat Aug 19 03:18:30 2006
@@ -62,6 +62,7 @@
     .default_source = NULL,
     .default_server = NULL,
     .autospawn = 0,
+    .disable_shm = 0,
     .cookie_file = NULL,
     .cookie_valid = 0,
 };
@@ -100,6 +101,7 @@
         { "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 @@
     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") :

Modified: trunk/src/pulse/client-conf.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/client-conf.h?rev=1284&root=pulseaudio&r1=1283&r2=1284&view=diff
==============================================================================
--- trunk/src/pulse/client-conf.h (original)
+++ trunk/src/pulse/client-conf.h Sat Aug 19 03:18:30 2006
@@ -28,7 +28,7 @@
 
 typedef struct pa_client_conf {
     char *daemon_binary, *extra_arguments, *default_sink, *default_source, *default_server, *cookie_file;
-    int autospawn;
+    int autospawn, disable_shm;
     uint8_t cookie[PA_NATIVE_COOKIE_LENGTH];
     int cookie_valid; /* non-zero, when cookie is valid */
 } pa_client_conf;

Modified: trunk/src/pulse/context.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/context.c?rev=1284&root=pulseaudio&r1=1283&r2=1284&view=diff
==============================================================================
--- trunk/src/pulse/context.c (original)
+++ trunk/src/pulse/context.c Sat Aug 19 03:18:30 2006
@@ -128,7 +128,6 @@
     c->subscribe_callback = NULL;
     c->subscribe_userdata = NULL;
 
-    c->mempool = pa_mempool_new(1);
     c->is_local = -1;
     c->server_list = NULL;
     c->server = NULL;
@@ -148,6 +147,8 @@
     pa_client_conf_from_x11(c->conf, NULL);
 #endif
     pa_client_conf_env(c->conf);
+
+    c->mempool = pa_mempool_new(!c->conf->disable_shm);
 
     return c;
 }