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

Enable per-user esound sockets by default. Esound CVS already enables this by default, and all sane distributions ship a patched esd anyway. And those which do not should get a life and start patching esd

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2145 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-03-27 23:06:26 +00:00
parent 5addad21a4
commit 14ed19cf8b
2 changed files with 47 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

72
configure.ac
View file

@ -1073,10 +1073,20 @@ 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.])) AC_ARG_ENABLE(
per_user_esound_socket,
AS_HELP_STRING([--disable-per-user-esound-socket], [Use per-user esound socket directory, like /tmp/.esd-UID/socket.]),
[
case "${enableval}" in
yes) per_user_esound_socket=1 ;;
no) per_user_esound_socket=0 ;;
*) AC_MSG_ERROR(bad value ${enableval} for --disable-per-user-esound-socket) ;;
esac
],
[per_user_esound_socket=1])
if test "x$with_peruser_esound" = "xyes"; then if test "x$per_user_esound_socket" = "x1"; then
AC_DEFINE([USE_PERUSER_ESOUND_SOCKET], [1], [Define this if you want per-user esound socket directories]) AC_DEFINE([USE_PER_USER_ESOUND_SOCKET], [1], [Define this if you want per-user esound socket directories])
fi fi
#### PulseAudio system runtime dir #### #### PulseAudio system runtime dir ####
@ -1210,32 +1220,38 @@ if test "x${HAVE_POLKIT}" = "x1" ; then
ENABLE_POLKIT=yes ENABLE_POLKIT=yes
fi fi
ENABLE_PER_USER_ESOUND_SOCKET=no
if test "x$per_user_esound_socket" = "x1" ; then
ENABLE_PER_USER_ESOUND_SOCKET=yes
fi
echo " echo "
---{ $PACKAGE_NAME $VERSION }--- ---{ $PACKAGE_NAME $VERSION }---
prefix: ${prefix} prefix: ${prefix}
sysconfdir: ${sysconfdir} sysconfdir: ${sysconfdir}
localstatedir: ${localstatedir} localstatedir: ${localstatedir}
System Runtime Path: ${PA_SYSTEM_RUNTIME_PATH} System Runtime Path: ${PA_SYSTEM_RUNTIME_PATH}
Compiler: ${CC} Compiler: ${CC}
CFLAGS: ${CFLAGS} CFLAGS: ${CFLAGS}
Have X11: ${ENABLE_X11} Have X11: ${ENABLE_X11}
Enable OSS: ${ENABLE_OSS} Enable OSS: ${ENABLE_OSS}
Enable Alsa: ${ENABLE_ALSA} Enable Alsa: ${ENABLE_ALSA}
Enable Solaris: ${ENABLE_SOLARIS} Enable Solaris: ${ENABLE_SOLARIS}
Enable GLib 2.0: ${ENABLE_GLIB20} Enable GLib 2.0: ${ENABLE_GLIB20}
Enable GConf: ${ENABLE_GCONF} Enable GConf: ${ENABLE_GCONF}
Enable Avahi: ${ENABLE_AVAHI} Enable Avahi: ${ENABLE_AVAHI}
Enable Jack: ${ENABLE_JACK} Enable Jack: ${ENABLE_JACK}
Enable Async DNS: ${ENABLE_LIBASYNCNS} Enable Async DNS: ${ENABLE_LIBASYNCNS}
Enable LIRC: ${ENABLE_LIRC} Enable LIRC: ${ENABLE_LIRC}
Enable HAL: ${ENABLE_HAL} Enable HAL: ${ENABLE_HAL}
Enable BlueZ: ${ENABLE_BLUEZ} Enable BlueZ: ${ENABLE_BLUEZ}
Enable TCP Wrappers: ${ENABLE_TCPWRAP} Enable TCP Wrappers: ${ENABLE_TCPWRAP}
Enable libsamplerate: ${ENABLE_LIBSAMPLERATE} Enable libsamplerate: ${ENABLE_LIBSAMPLERATE}
Enable PolicyKit: ${ENABLE_POLKIT} Enable PolicyKit: ${ENABLE_POLKIT}
System User: ${PA_SYSTEM_USER} System User: ${PA_SYSTEM_USER}
System Group: ${PA_SYSTEM_GROUP} System Group: ${PA_SYSTEM_GROUP}
Realtime Group: ${PA_REALTIME_GROUP} Realtime Group: ${PA_REALTIME_GROUP}
Access Group: ${PA_ACCESS_GROUP} Access Group: ${PA_ACCESS_GROUP}
Enable per-user EsounD socket: ${ENABLE_PER_USER_ESOUND_SOCKET}
" "

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

@ -218,7 +218,7 @@ int pa__init(pa_module*m) {
char tmp[PATH_MAX]; char tmp[PATH_MAX];
#if defined(USE_PROTOCOL_ESOUND) #if defined(USE_PROTOCOL_ESOUND)
#if defined(USE_PERUSER_ESOUND_SOCKET) #if defined(USE_PER_USER_ESOUND_SOCKET)
char esdsocketpath[PATH_MAX]; char esdsocketpath[PATH_MAX];
#else #else
const char esdsocketpath[] = "/tmp/.esd/socket"; const char esdsocketpath[] = "/tmp/.esd/socket";
@ -269,9 +269,10 @@ int pa__init(pa_module*m) {
#if defined(USE_PROTOCOL_ESOUND) #if defined(USE_PROTOCOL_ESOUND)
#if defined(USE_PERUSER_ESOUND_SOCKET) #if defined(USE_PER_USER_ESOUND_SOCKET)
snprintf(esdsocketpath, sizeof(esdsocketpath), "/tmp/.esd-%lu/socket", (unsigned long) getuid()); snprintf(esdsocketpath, sizeof(esdsocketpath), "/tmp/.esd-%lu/socket", (unsigned long) getuid());
#endif #endif
pa_runtime_path(pa_modargs_get_value(ma, "socket", esdsocketpath), tmp, sizeof(tmp)); 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);