MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-15 00:35:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move last_active check into the device add case

Browse Source
This commit is contained in:
Julien BLACHE 2010-09-30 19:08:43 +02:00
parent cd8686be82
commit 01df67ceb6
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/player.c
View File

@ -2916,22 +2916,6 @@ raop_device_cb(const char *name, const char *type, const char *domain, const cha
DPRINTF(E_DBG, L_PLAYER, "Found AirTunes device %" PRIx64 "/%s (%d)\n", id, at_name, port); DPRINTF(E_DBG, L_PLAYER, "Found AirTunes device %" PRIx64 "/%s (%d)\n", id, at_name, port);
/* Check if the device was selected last time */
if (time(NULL) < dev_deadline)
{
player_get_status(&status);
if (status.status != PLAY_STOPPED)
last_active = 0;
else
{
ret = db_config_has_tuple_hex64(VAR_ACTIVE_SPK, id);
last_active = (ret == 1);
}
}
else
last_active = 0;
if (port < 0) if (port < 0)
{ {
/* Device stopped advertising */ /* Device stopped advertising */
@ -3071,6 +3055,22 @@ raop_device_cb(const char *name, const char *type, const char *domain, const cha
encrypt = 0; encrypt = 0;
no_am: no_am:
/* Check if the device was selected last time */
if (time(NULL) < dev_deadline)
{
player_get_status(&status);
if (status.status != PLAY_STOPPED)
last_active = 0;
else
{
ret = db_config_has_tuple_hex64(VAR_ACTIVE_SPK, id);
last_active = (ret == 1);
}
}
else
last_active = 0;
pthread_mutex_lock(&dev_lck); pthread_mutex_lock(&dev_lck);
for (rd = dev_list; rd; rd = rd->next) for (rd = dev_list; rd; rd = rd->next)