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

[player] Fix autoselect so it also applies when there are no selected devices (second attempt)

Browse Source 
Second attempt at fixing regression in version 27.2. First attempt was commit 2345885.

Closes #1091.
This commit is contained in:
ejurgensen 2020-09-21 17:12:18 +02:00
parent 513a09e6d1
commit 1f45967481
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/player.c
View File

@ -2080,19 +2080,27 @@ playback_start_item(void *arg, int *retval)
if (*retval < 0) if (*retval < 0)
DPRINTF(E_WARN, L_PLAYER, "All selected speakers failed to start\n"); DPRINTF(E_WARN, L_PLAYER, "All selected speakers failed to start\n");
// autoselect also applies in non-error cases (if no devices were selected) // autoselect also applies in non-error cases (if no devices were selected).
if (speaker_autoselect && outputs_sessions_count() == 0) // Note that if session count is 0 then retval should never be positive,
// because that would mean we are initiating a session. Just to be safe, we
// check anyway.
if (speaker_autoselect && outputs_sessions_count() == 0 && *retval <= 0)
{ {
for (device = outputs_list(); (*retval < 0) && device; device = device->next) for (device = outputs_list(); device; device = device->next)
{ {
if (!device->selected && outputs_priority(device) != 0 && !device->session) if (device->selected || outputs_priority(device) == 0 || device->session)
*retval = outputs_device_start(device, device_activate_cb, false); continue;
}
if (strcmp(device->name, "Stuen") != 0)
continue;
*retval = outputs_device_start(device, device_activate_cb, false);
if (*retval < 0)
continue;
if (*retval >= 0)
{
DPRINTF(E_LOG, L_PLAYER, "Autoselected %s device '%s'\n", device->type_name, device->name); DPRINTF(E_LOG, L_PLAYER, "Autoselected %s device '%s'\n", device->type_name, device->name);
outputs_device_select(device, -1); outputs_device_select(device, -1);
break;
} }
} }