mirrors/vlc
0
0
Fork 0
mirror of https://github.com/videolan/vlc.git synced 2024-11-30 13:25:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "service_discovery: lock playlist_ServicesDiscoveryKillAll()"

Browse Source 
This reverts commit d9661b8bdc.
There is no point in locking there, since interfaces are gone and the
playlist is disabled already.
This commit is contained in:
Rémi Denis-Courmont 2018-02-20 19:04:50 +02:00
parent e53149b6b1
commit b46ddaecda
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/playlist/services_discovery.c
View File

@ -147,24 +147,23 @@ int playlist_ServicesDiscoveryAdd(playlist_t *playlist, const char *chain)
return VLC_SUCCESS;
}
static void playlist_ServicesDiscoveryInternalRemoveLocked(playlist_t *playlist,
vlc_sd_internal_t *sds)
static void playlist_ServicesDiscoveryInternalRemove(playlist_t *playlist,
vlc_sd_internal_t *sds)
{
assert(sds->sd != NULL);
playlist_Unlock(playlist);
vlc_sd_Destroy(sds->sd);
/* Remove the sd playlist node if it exists */
playlist_Lock(playlist);
if (sds->node != NULL)
playlist_NodeDeleteExplicit(playlist, sds->node,
PLAYLIST_DELETE_FORCE | PLAYLIST_DELETE_STOP_IF_CURRENT );
playlist_Unlock(playlist);
free(sds);
}
int playlist_ServicesDiscoveryRemove(playlist_t *playlist, const char *name)
{
playlist_private_t *priv = pl_priv(playlist);
@ -182,18 +181,15 @@ int playlist_ServicesDiscoveryRemove(playlist_t *playlist, const char *name)
break;
}
}
playlist_Unlock(playlist);
if (sds == NULL)
{
msg_Warn(playlist, "discovery %s is not loaded", name);
playlist_Unlock(playlist);
return VLC_EGENERIC;
}
playlist_ServicesDiscoveryInternalRemoveLocked(playlist, sds);
playlist_Unlock(playlist);
playlist_ServicesDiscoveryInternalRemove(playlist, sds);
return VLC_SUCCESS;
}
@ -248,14 +244,8 @@ void playlist_ServicesDiscoveryKillAll(playlist_t *playlist)
{
playlist_private_t *priv = pl_priv(playlist);
playlist_Lock(playlist);
while (priv->i_sds > 0)
{
vlc_sd_internal_t *sds = priv->pp_sds[priv->i_sds - 1];
TAB_ERASE(priv->i_sds, priv->pp_sds, priv->i_sds - 1);
for (int i = 0; i < priv->i_sds; i++)
playlist_ServicesDiscoveryInternalRemove(playlist, priv->pp_sds[i]);
playlist_ServicesDiscoveryInternalRemoveLocked(playlist, sds);
}
playlist_Unlock(playlist);
TAB_CLEAN(priv->i_sds, priv->pp_sds);
}