<div dir="ltr">unsubscribe<div><br></div><div><br></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Jul 25, 2017 at 9:48 AM, Marvin Scholz <span dir="ltr"><<a href="mailto:epirat07@gmail.com" target="_blank">epirat07@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">---<br>
src/playlist/services_<wbr>discovery.c | 48 +++++++++++++++++++-----------<wbr>---------<br>
1 file changed, 24 insertions(+), 24 deletions(-)<br>
<br>
diff --git a/src/playlist/services_<wbr>discovery.c b/src/playlist/services_<wbr>discovery.c<br>
index d041c728b2..019c47e806 100644<br>
--- a/src/playlist/services_<wbr>discovery.c<br>
+++ b/src/playlist/services_<wbr>discovery.c<br>
@@ -46,19 +46,19 @@ static void playlist_sd_item_added(<wbr>services_discovery_t *sd,<br>
assert(parent == NULL || psz_cat == NULL);<br>
<br>
vlc_sd_internal_t *sds = sd->owner.sys;<br>
- playlist_t *playlist = (playlist_t *)sd->obj.parent;<br>
+ playlist_t *p_playlist = (playlist_t *)sd->obj.parent;<br>
playlist_item_t *node;<br>
const char *longname = (sd->description != NULL) ? sd->description : "?";<br>
<br>
msg_Dbg(sd, "adding sd item: %s", p_input->psz_name ? p_input->psz_name : "(null)");<br>
<br>
- playlist_Lock(playlist);<br>
+ PL_LOCK;<br>
if (sds->node == NULL)<br>
- sds->node = playlist_NodeCreate(playlist, longname, &playlist->root,<br>
+ sds->node = playlist_NodeCreate(p_<wbr>playlist, longname, &p_playlist->root,<br>
PLAYLIST_END, PLAYLIST_RO_FLAG);<br>
<br>
if (parent != NULL)<br>
- node = playlist_ItemGetByInput(<wbr>playlist, parent);<br>
+ node = playlist_ItemGetByInput(p_<wbr>playlist, parent);<br>
else<br>
if (psz_cat == NULL)<br>
node = sds->node;<br>
@@ -67,12 +67,12 @@ static void playlist_sd_item_added(<wbr>services_discovery_t *sd,<br>
* This is clearly a hack. TODO: remove this. */<br>
node = playlist_ChildSearchName(sds-><wbr>node, psz_cat);<br>
if (node == NULL)<br>
- node = playlist_NodeCreate(playlist, psz_cat, sds->node,<br>
+ node = playlist_NodeCreate(p_<wbr>playlist, psz_cat, sds->node,<br>
PLAYLIST_END, PLAYLIST_RO_FLAG);<br>
}<br>
<br>
- playlist_NodeAddInput(<wbr>playlist, p_input, node, PLAYLIST_END);<br>
- playlist_Unlock(playlist);<br>
+ playlist_NodeAddInput(p_<wbr>playlist, p_input, node, PLAYLIST_END);<br>
+ PL_UNLOCK;<br>
}<br>
<br>
/* A new item has been removed from a certain sd */<br>
@@ -110,7 +110,7 @@ static void playlist_sd_item_removed(<wbr>services_discovery_t *sd,<br>
PL_UNLOCK;<br>
}<br>
<br>
-int playlist_ServicesDiscoveryAdd(<wbr>playlist_t *playlist, const char *chain)<br>
+int playlist_ServicesDiscoveryAdd(<wbr>playlist_t *p_playlist, const char *chain)<br>
{<br>
vlc_sd_internal_t *sds = malloc(sizeof (*sds) + strlen(chain) + 1);<br>
if (unlikely(sds == NULL))<br>
@@ -125,7 +125,7 @@ int playlist_ServicesDiscoveryAdd(<wbr>playlist_t *playlist, const char *chain)<br>
};<br>
<br>
/* Perform the addition */<br>
- sds->sd = vlc_sd_Create(VLC_OBJECT(<wbr>playlist), chain, &owner);<br>
+ sds->sd = vlc_sd_Create(VLC_OBJECT(p_<wbr>playlist), chain, &owner);<br>
if (unlikely(sds->sd == NULL))<br>
{<br>
free(sds);<br>
@@ -134,42 +134,42 @@ int playlist_ServicesDiscoveryAdd(<wbr>playlist_t *playlist, const char *chain)<br>
<br>
strcpy(sds->name, chain);<br>
<br>
- playlist_Lock(playlist);<br>
+ PL_LOCK;<br>
/* Backward compatibility with Qt UI: create the node even if the SD<br>
* has not discovered any item. */<br>
if (sds->node == NULL && sds->sd->description != NULL)<br>
- sds->node = playlist_NodeCreate(playlist, sds->sd->description,<br>
- &playlist->root, PLAYLIST_END,<br>
+ sds->node = playlist_NodeCreate(p_<wbr>playlist, sds->sd->description,<br>
+ &p_playlist->root, PLAYLIST_END,<br>
PLAYLIST_RO_FLAG);<br>
<br>
- TAB_APPEND(pl_priv(playlist)-><wbr>i_sds, pl_priv(playlist)->pp_sds, sds);<br>
- playlist_Unlock(playlist);<br>
+ TAB_APPEND(pl_priv(p_playlist)<wbr>->i_sds, pl_priv(p_playlist)->pp_sds, sds);<br>
+ PL_UNLOCK;<br>
return VLC_SUCCESS;<br>
}<br>
<br>
-static void playlist_<wbr>ServicesDiscoveryInternalRemov<wbr>e(playlist_t *playlist,<br>
+static void playlist_<wbr>ServicesDiscoveryInternalRemov<wbr>e(playlist_t *p_playlist,<br>
vlc_sd_internal_t *sds)<br>
{<br>
assert(sds->sd != NULL);<br>
vlc_sd_Destroy(sds->sd);<br>
<br>
/* Remove the sd playlist node if it exists */<br>
- playlist_Lock(playlist);<br>
+ PL_LOCK;<br>
if (sds->node != NULL)<br>
- playlist_NodeDeleteExplicit(<wbr>playlist, sds->node,<br>
+ playlist_NodeDeleteExplicit(p_<wbr>playlist, sds->node,<br>
PLAYLIST_DELETE_FORCE | PLAYLIST_DELETE_STOP_IF_<wbr>CURRENT );<br>
- playlist_Unlock(playlist);<br>
+ PL_UNLOCK;<br>
<br>
free(sds);<br>
}<br>
<br>
<br>
-int playlist_<wbr>ServicesDiscoveryRemove(<wbr>playlist_t *playlist, const char *name)<br>
+int playlist_<wbr>ServicesDiscoveryRemove(<wbr>playlist_t *p_playlist, const char *name)<br>
{<br>
- playlist_private_t *priv = pl_priv(playlist);<br>
+ playlist_private_t *priv = pl_priv(p_playlist);<br>
vlc_sd_internal_t *sds = NULL;<br>
<br>
- playlist_Lock(playlist);<br>
+ PL_LOCK;<br>
for (int i = 0; i < priv->i_sds; i++)<br>
{<br>
vlc_sd_internal_t *entry = priv->pp_sds[i];<br>
@@ -181,15 +181,15 @@ int playlist_<wbr>ServicesDiscoveryRemove(<wbr>playlist_t *playlist, const char *name)<br>
break;<br>
}<br>
}<br>
- playlist_Unlock(playlist);<br>
+ PL_UNLOCK;<br>
<br>
if (sds == NULL)<br>
{<br>
- msg_Warn(playlist, "discovery %s is not loaded", name);<br>
+ msg_Warn(p_playlist, "discovery %s is not loaded", name);<br>
return VLC_EGENERIC;<br>
}<br>
<br>
- playlist_<wbr>ServicesDiscoveryInternalRemov<wbr>e(playlist, sds);<br>
+ playlist_<wbr>ServicesDiscoveryInternalRemov<wbr>e(p_playlist, sds);<br>
return VLC_SUCCESS;<br>
}<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
2.11.0 (Apple Git-81)<br>
<br>
______________________________<wbr>_________________<br>
vlc-devel mailing list<br>
To unsubscribe or modify your subscription options:<br>
<a href="https://mailman.videolan.org/listinfo/vlc-devel" rel="noreferrer" target="_blank">https://mailman.videolan.org/<wbr>listinfo/vlc-devel</a></font></span></blockquote></div><br></div>