MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-28 08:05:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

[pulseaudio] Modification of f202b5d: Now always try to start Pulseaudio

Browse Source
This commit is contained in:
ejurgensen 2016-09-26 20:48:00 +02:00
parent 1af24044de
commit ac9900ff1a
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/outputs/pulse.c
View File

@ -786,6 +786,16 @@ pulse_init(void)
if (type && (strcasecmp(type, "pulseaudio") != 0)) if (type && (strcasecmp(type, "pulseaudio") != 0))
return -1; return -1;
// In some situations Pulseaudio won't autospawn, and we don't want to trouble
// the user with setting up system mode (which isn't recommended anyway), so
// we use this sledgehammer approach
ret = system("pulseaudio --start");
if (ret < 0)
{
DPRINTF(E_LOG, L_LAUDIO, "Could not start Pulseaudio\n");
return -1;
}
ret = 0; ret = 0;
if (!(p->mainloop = pa_threaded_mainloop_new())) if (!(p->mainloop = pa_threaded_mainloop_new()))
@ -806,26 +816,7 @@ pulse_init(void)
if (pa_context_connect(p->context, NULL, 0, NULL) < 0) if (pa_context_connect(p->context, NULL, 0, NULL) < 0)
{ {
ret = pa_context_errno(p->context); ret = pa_context_errno(p->context);
if (ret == PA_ERR_CONNECTIONREFUSED) goto fail;
{
DPRINTF(E_LOG, L_LAUDIO, "Connection to Pulseaudio refused, trying to start daemon for our user\n");
ret = system("pulseaudio --start");
if (ret < 0)
{
DPRINTF(E_LOG, L_LAUDIO, "Could not start Pulseaudio\n");
return -1;
}
}
// Try connecting again
if (pa_context_connect(p->context, NULL, 0, NULL) < 0)
{
ret = pa_context_errno(p->context);
goto fail;
}
DPRINTF(E_LOG, L_LAUDIO, "Connection to Pulseaudio established\n");
} }
pa_threaded_mainloop_lock(p->mainloop); pa_threaded_mainloop_lock(p->mainloop);