Commit ed100a38 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

playlist: remove playlist_item_t.p_playlist

parent e996f3d3
......@@ -139,8 +139,6 @@ struct playlist_item_t
int i_id; /**< Playlist item specific id */
uint8_t i_flags; /**< Flags \see playlist_item_flags_e */
playlist_t *p_playlist; /**< Parent playlist */
};
typedef enum {
......
......@@ -271,7 +271,6 @@ playlist_item_t *playlist_ItemNewFromInput( playlist_t *p_playlist,
p_item->pp_children = NULL;
p_item->i_nb_played = 0;
p_item->i_flags = 0;
p_item->p_playlist = p_playlist;
PL_ASSERT_LOCKED;
......@@ -766,10 +765,6 @@ void playlist_SendAddNotify( playlist_t *p_playlist, playlist_item_t *item,
*/
mtime_t playlist_GetNodeDuration( playlist_item_t* node )
{
/* For the assert */
playlist_t *p_playlist = node->p_playlist;
PL_ASSERT_LOCKED;
mtime_t mt_duration = 0;
if( node->i_children != -1 )
......
......@@ -189,8 +189,8 @@ static void playlist_sd_item_removed(services_discovery_t *sd,
input_item_t *p_input)
{
vlc_sd_internal_t *sds = sd->owner.sys;
playlist_t *p_playlist = (playlist_t *)sd->obj.parent;
playlist_item_t *p_sd_node = sds->node;
playlist_t *p_playlist = p_sd_node->p_playlist;
PL_LOCK;
playlist_item_t *p_item =
......
......@@ -176,6 +176,9 @@ int playlist_NodeInsert( playlist_t *p_playlist,
/**
* Search a child of a node by its name
*
* \note The playlist must be locked, and the result is only valid until the
* playlist is unlocked.
*
* \param p_node the node
* \param psz_search the name of the child to search
* \return the child item or NULL if not found or error
......@@ -183,8 +186,6 @@ int playlist_NodeInsert( playlist_t *p_playlist,
playlist_item_t *playlist_ChildSearchName( playlist_item_t *p_node,
const char *psz_search )
{
playlist_t * p_playlist = p_node->p_playlist; /* For assert_locked */
PL_ASSERT_LOCKED;
int i;
if( p_node->i_children < 0 )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment