mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-06 13:29:56 -05:00
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
This commit is contained in:
commit
7bc1847596
32 changed files with 115 additions and 54 deletions
|
|
@ -554,6 +554,7 @@ static void setup_context(pa_context *c, pa_iochannel *io) {
|
|||
pa_context_unref(c);
|
||||
}
|
||||
|
||||
#if ENABLE_LEGACY_RUNTIME_DIR
|
||||
static char *get_old_legacy_runtime_dir(void) {
|
||||
char *p, u[128];
|
||||
struct stat st;
|
||||
|
|
@ -597,10 +598,12 @@ static char *get_very_old_legacy_runtime_dir(void) {
|
|||
|
||||
return p;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
static pa_strlist *prepend_per_user(pa_strlist *l) {
|
||||
char *ufn;
|
||||
|
||||
#if ENABLE_LEGACY_RUNTIME_DIR
|
||||
static char *legacy_dir;
|
||||
|
||||
/* The very old per-user instance path (< 0.9.11). This is supported only to ease upgrades */
|
||||
|
|
@ -618,6 +621,7 @@ static pa_strlist *prepend_per_user(pa_strlist *l) {
|
|||
pa_xfree(p);
|
||||
pa_xfree(legacy_dir);
|
||||
}
|
||||
#endif
|
||||
|
||||
/* The per-user instance */
|
||||
if ((ufn = pa_runtime_path(PA_NATIVE_DEFAULT_UNIX_SOCKET))) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue