MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[player] Refactor speaker_set/speaker_activate

This commit is contained in:
chme 2018-02-07 21:17:54 +01:00
parent f2659d995b
commit d36e6ac5ab
1 changed files with 25 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/player.c
View File

@ -2436,12 +2436,21 @@ speaker_activate(struct output_device *device)
{ {
int ret; int ret;
if (!device) if (device->has_password && !device->password)
{ {
DPRINTF(E_LOG, L_PLAYER, "Bug! speaker_activate called with device\n"); DPRINTF(E_INFO, L_PLAYER, "The %s device '%s' is password-protected, but we don't have it\n", device->type_name, device->name);
return -1;
return -2;
} }
DPRINTF(E_DBG, L_PLAYER, "The %s device '%s' is selected\n", device->type_name, device->name);
if (!device->selected)
speaker_select_output(device);
if (device->session)
return 0;
if (player_state == PLAY_PLAYING) if (player_state == PLAY_PLAYING)
{ {
DPRINTF(E_DBG, L_PLAYER, "Activating %s device '%s'\n", device->type_name, device->name); DPRINTF(E_DBG, L_PLAYER, "Activating %s device '%s'\n", device->type_name, device->name);
@ -2450,7 +2459,7 @@ speaker_activate(struct output_device *device)
if (ret < 0) if (ret < 0)
{ {
DPRINTF(E_LOG, L_PLAYER, "Could not start %s device '%s'\n", device->type_name, device->name); DPRINTF(E_LOG, L_PLAYER, "Could not start %s device '%s'\n", device->type_name, device->name);
return -1; goto error;
} }
} }
else else
@ -2461,11 +2470,16 @@ speaker_activate(struct output_device *device)
if (ret < 0) if (ret < 0)
{ {
DPRINTF(E_LOG, L_PLAYER, "Could not probe %s device '%s'\n", device->type_name, device->name); DPRINTF(E_LOG, L_PLAYER, "Could not probe %s device '%s'\n", device->type_name, device->name);
return -1; goto error;
} }
} }
return 0; return 0;
error:
DPRINTF(E_LOG, L_PLAYER, "Could not activate %s device '%s'\n", device->type_name, device->name);
speaker_deselect_output(device);
return -1;
} }
static int static int
@ -2518,40 +2532,17 @@ speaker_set(void *arg, int *retval)
if (i <= nspk) if (i <= nspk)
{ {
if (device->has_password && !device->password) ret = speaker_activate(device);
{
DPRINTF(E_INFO, L_PLAYER, "The %s device '%s' is password-protected, but we don't have it\n", device->type_name, device->name);
cmdarg->speaker_set_param.intval = -2; if (ret > 0)
continue; (*retval)++;
} else if (ret < 0 && cmdarg->speaker_set_param.intval != -2)
cmdarg->speaker_set_param.intval = ret;
DPRINTF(E_DBG, L_PLAYER, "The %s device '%s' is selected\n", device->type_name, device->name);
if (!device->selected)
speaker_select_output(device);
if (!device->session)
{
ret = speaker_activate(device);
if (ret < 0)
{
DPRINTF(E_LOG, L_PLAYER, "Could not activate %s device '%s'\n", device->type_name, device->name);
speaker_deselect_output(device);
if (cmdarg->speaker_set_param.intval != -2)
cmdarg->speaker_set_param.intval = -1;
}
else
(*retval)++;
}
} }
else else
{ {
DPRINTF(E_DBG, L_PLAYER, "The %s device '%s' is NOT selected\n", device->type_name, device->name);
ret = speaker_deactivate(device); ret = speaker_deactivate(device);
if (ret > 0) if (ret > 0)
(*retval)++; (*retval)++;
} }