diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-03-31 23:08:01 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-03-31 23:08:01 +0000 |
| commit | ecf643966111387953cbfd0bce7f39b6c3d8116a (patch) | |
| tree | 42ee50476576392c97ced9785ab2786958f94c71 /src/modules/module-protocol-stub.c | |
| parent | 106ddb9211a98dec764ca45ca02b46c31354e631 (diff) | |
catch up with trunk HEAD (i.e. 2118:2213)
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2214 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/modules/module-protocol-stub.c')
| -rw-r--r-- | src/modules/module-protocol-stub.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/modules/module-protocol-stub.c b/src/modules/module-protocol-stub.c index a9bd850b..600201b4 100644 --- a/src/modules/module-protocol-stub.c +++ b/src/modules/module-protocol-stub.c @@ -218,7 +218,7 @@ int pa__init(pa_module*m) { char tmp[PATH_MAX]; #if defined(USE_PROTOCOL_ESOUND) -#if defined(USE_PERUSER_ESOUND_SOCKET) +#if defined(USE_PER_USER_ESOUND_SOCKET) char esdsocketpath[PATH_MAX]; #else const char esdsocketpath[] = "/tmp/.esd/socket"; @@ -269,9 +269,10 @@ int pa__init(pa_module*m) { #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()); #endif + pa_runtime_path(pa_modargs_get_value(ma, "socket", esdsocketpath), tmp, sizeof(tmp)); u->socket_path = pa_xstrdup(tmp); |