mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-11 13:30:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge r2083 from trunk

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/prepare-0.9.10@2147 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-03-27 23:16:29 +00:00
parent cefa0eb9d9
commit d055127364
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
configure.ac
View file

@ -982,6 +982,12 @@ fi
AC_SUBST(PA_ACCESS_GROUP) AC_SUBST(PA_ACCESS_GROUP)
AC_DEFINE_UNQUOTED(PA_ACCESS_GROUP,"$PA_ACCESS_GROUP", [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 #### #### PulseAudio system runtime dir ####
PA_SYSTEM_RUNTIME_PATH="${localstatedir}/run/pulse" PA_SYSTEM_RUNTIME_PATH="${localstatedir}/run/pulse"
AC_SUBST(PA_SYSTEM_RUNTIME_PATH) AC_SUBST(PA_SYSTEM_RUNTIME_PATH)

12
src/modules/module-protocol-stub.c
View file

@ -218,7 +218,11 @@ int pa__init(pa_module*m) {
char tmp[PATH_MAX]; char tmp[PATH_MAX];
#if defined(USE_PROTOCOL_ESOUND) #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
#endif #endif
@ -265,8 +269,10 @@ int pa__init(pa_module*m) {
#if defined(USE_PROTOCOL_ESOUND) #if defined(USE_PROTOCOL_ESOUND)
snprintf(tmp2, sizeof(tmp2), "/tmp/.esd-%lu/socket", (unsigned long) getuid()); #if defined(USE_PERUSER_ESOUND_SOCKET)
pa_runtime_path(pa_modargs_get_value(ma, "socket", tmp2), tmp, sizeof(tmp)); 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); u->socket_path = pa_xstrdup(tmp);
/* This socket doesn't reside in our own runtime dir but in /* This socket doesn't reside in our own runtime dir but in