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

by default, store esd socket in /tmp/.esd-id -u/socket, instead of /tmp/.esd/socket, to allow multiple simultaneous esd instances. this is only compatible with a patched esd, which however ubuntu and fedora ship now. other distros need to patch their esd as well, or may pass socket=/tmp/.esd/socket to module-protocol-esound-unix

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1598 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-08-09 16:27:24 +00:00
parent 33cd5e26cf
commit eaddc0195c
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -154,7 +154,6 @@
#define protocol_free pa_protocol_esound_free #define protocol_free pa_protocol_esound_free
#define TCPWRAP_SERVICE "esound" #define TCPWRAP_SERVICE "esound"
#define IPV4_PORT ESD_DEFAULT_PORT #define IPV4_PORT ESD_DEFAULT_PORT
#define UNIX_SOCKET ESD_UNIX_SOCKET_NAME
#define MODULE_ARGUMENTS_COMMON "sink", "source", "auth-anonymous", "cookie", #define MODULE_ARGUMENTS_COMMON "sink", "source", "auth-anonymous", "cookie",
#ifdef USE_TCP_SOCKETS #ifdef USE_TCP_SOCKETS
#include "module-esound-protocol-tcp-symdef.h" #include "module-esound-protocol-tcp-symdef.h"
@ -219,6 +218,10 @@ int pa__init(pa_core *c, pa_module*m) {
pa_socket_server *s; pa_socket_server *s;
int r; int r;
char tmp[PATH_MAX]; char tmp[PATH_MAX];
#if defined(USE_PROTOCOL_ESOUND)
char tmp2[PATH_MAX];
#endif
#endif #endif
assert(c && m); assert(c && m);
@ -262,11 +265,12 @@ int pa__init(pa_core *c, pa_module*m) {
#else #else
pa_runtime_path(pa_modargs_get_value(ma, "socket", UNIX_SOCKET), tmp, sizeof(tmp));
u->socket_path = pa_xstrdup(tmp);
#if defined(USE_PROTOCOL_ESOUND) #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));
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
* /tmp/.esd/, hence we have to create the dir first */ * /tmp/.esd/, hence we have to create the dir first */
@ -274,6 +278,10 @@ int pa__init(pa_core *c, pa_module*m) {
pa_log("Failed to create socket directory '%s': %s\n", u->socket_path, pa_cstrerror(errno)); pa_log("Failed to create socket directory '%s': %s\n", u->socket_path, pa_cstrerror(errno));
goto fail; goto fail;
} }
#else
pa_runtime_path(pa_modargs_get_value(ma, "socket", UNIX_SOCKET), tmp, sizeof(tmp));
u->socket_path = pa_xstrdup(tmp);
#endif #endif
if ((r = pa_unix_socket_remove_stale(tmp)) < 0) { if ((r = pa_unix_socket_remove_stale(tmp)) < 0) {