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

[player] Always reselect output devices when they return online

Browse Source 
Consider this use case:
1. Playback stops, device switched off
2. Device switched back on, playback started by user
Before this commit, the device would be unselected when it came back on.
I don't think that is desirable, so with this commit the selection will
stay (except if the device comes back on during playback).
This commit is contained in:
ejurgensen 2016-04-30 23:55:45 +02:00
parent 70e85e1be2
commit 1f10c6a928
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/player.c
View File

@ -279,7 +279,6 @@ static uint64_t pb_pos;
static uint64_t last_rtptime; static uint64_t last_rtptime;
/* Output devices */ /* Output devices */
static int dev_autoselect; //TODO [player] Is this still necessary?
static struct output_device *dev_list; static struct output_device *dev_list;
/* Output status */ /* Output status */
@ -343,9 +342,6 @@ status_update(enum play_status status)
player_state = status; player_state = status;
listener_notify(LISTENER_PLAYER); listener_notify(LISTENER_PLAYER);
if (status == PLAY_PLAYING)
dev_autoselect = 0;
} }
@ -1641,17 +1637,17 @@ device_remove(struct output_device *remove)
if (!device) if (!device)
return; return;
/* Save device volume */
ret = db_speaker_save(remove->id, remove->selected, remove->volume, remove->name);
if (ret < 0)
DPRINTF(E_LOG, L_PLAYER, "Could not save state for %s device '%s'\n", remove->type_name, remove->name);
DPRINTF(E_DBG, L_PLAYER, "Removing %s device '%s'; stopped advertising\n", remove->type_name, remove->name); DPRINTF(E_DBG, L_PLAYER, "Removing %s device '%s'; stopped advertising\n", remove->type_name, remove->name);
/* Make sure device isn't selected anymore */ /* Make sure device isn't selected anymore */
if (device->selected) if (remove->selected)
speaker_deselect_output(remove); speaker_deselect_output(remove);
/* Save device volume */
ret = db_speaker_save(remove->id, 0, remove->volume, remove->name);
if (ret < 0)
DPRINTF(E_LOG, L_PLAYER, "Could not save state for %s device '%s'\n", remove->type_name, remove->name);
if (!prev) if (!prev)
dev_list = remove->next; dev_list = remove->next;
else else
@ -1702,7 +1698,7 @@ device_add(struct player_command *cmd)
device->volume = (master_volume >= 0) ? master_volume : PLAYER_DEFAULT_VOLUME; device->volume = (master_volume >= 0) ? master_volume : PLAYER_DEFAULT_VOLUME;
} }
if (dev_autoselect && selected) if (selected && (player_state != PLAY_PLAYING))
speaker_select_output(device); speaker_select_output(device);
device->next = dev_list; device->next = dev_list;
@ -4335,7 +4331,6 @@ player_init(void)
clear_queue_on_stop_disabled = cfg_getbool(cfg_getsec(cfg, "mpd"), "clear_queue_on_stop_disable"); clear_queue_on_stop_disabled = cfg_getbool(cfg_getsec(cfg, "mpd"), "clear_queue_on_stop_disable");
dev_autoselect = 1;
dev_list = NULL; dev_list = NULL;
master_volume = -1; master_volume = -1;