[pulseaudio-commits] r2147 - in /branches/prepare-0.9.10: configure.ac src/modules/module-protocol-stub.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Fri Mar 28 00:16:29 2008
New Revision: 2147

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=2147&root=pulseaudio&view=rev
Log:
merge r2083 from trunk

Modified:
    branches/prepare-0.9.10/configure.ac
    branches/prepare-0.9.10/src/modules/module-protocol-stub.c

Modified: branches/prepare-0.9.10/configure.ac
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/prepare-0.9.10/configure.ac?rev=2147&root=pulseaudio&r1=2146&r2=2147&view=diff
==============================================================================
--- branches/prepare-0.9.10/configure.ac (original)
+++ branches/prepare-0.9.10/configure.ac Fri Mar 28 00:16:29 2008
@@ -981,6 +981,12 @@
 fi
 AC_SUBST(PA_ACCESS_GROUP)
 AC_DEFINE_UNQUOTED(PA_ACCESS_GROUP,"$PA_ACCESS_GROUP", [Access group])
+
+AC_ARG_WITH(peruser_esound, AS_HELP_STRING([--with-peruser-esound-socket], [Use per-user esound socket directory, like /tmp/.esd-UID/socket.]))
+
+if test "x$with_peruser_esound" = "xyes"; then
+   AC_DEFINE([USE_PERUSER_ESOUND_SOCKET], [1], [Define this if you want per-user esound socket directories])
+fi
 
 #### PulseAudio system runtime dir ####
 PA_SYSTEM_RUNTIME_PATH="${localstatedir}/run/pulse"

Modified: branches/prepare-0.9.10/src/modules/module-protocol-stub.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/prepare-0.9.10/src/modules/module-protocol-stub.c?rev=2147&root=pulseaudio&r1=2146&r2=2147&view=diff
==============================================================================
--- branches/prepare-0.9.10/src/modules/module-protocol-stub.c (original)
+++ branches/prepare-0.9.10/src/modules/module-protocol-stub.c Fri Mar 28 00:16:29 2008
@@ -218,7 +218,11 @@
     char tmp[PATH_MAX];
 
 #if defined(USE_PROTOCOL_ESOUND)
-    char tmp2[PATH_MAX];
+#if defined(USE_PERUSER_ESOUND_SOCKET)
+    char esdsocketpath[PATH_MAX];
+#else
+    const char esdsocketpath[] = "/tmp/.esd/socket";
+#endif
 #endif
 #endif
 
@@ -265,8 +269,10 @@
 
 #if defined(USE_PROTOCOL_ESOUND)
 
-    snprintf(tmp2, sizeof(tmp2), "/tmp/.esd-%lu/socket", (unsigned long) getuid());
-    pa_runtime_path(pa_modargs_get_value(ma, "socket", tmp2), tmp, sizeof(tmp));
+#if defined(USE_PERUSER_ESOUND_SOCKET)
+    snprintf(esdsocketpath, sizeof(esdsocketpath), "/tmp/.esd-%lu/socket", (unsigned long) getuid());
+#endif
+    pa_runtime_path(pa_modargs_get_value(ma, "socket", esdsocketpath), tmp, sizeof(tmp));
     u->socket_path = pa_xstrdup(tmp);
 
     /* This socket doesn't reside in our own runtime dir but in