# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <assert.h>
#include "vlc_playlist.h"
#include "playlist_internal.h"
playlist_item_t *p_parent, int i_flags,
input_item_t *p_input )
{
- input_item_t *p_new_input;
+ input_item_t *p_new_input = NULL;
playlist_item_t *p_item;
if( !psz_name ) psz_name = _("Undefined");
if( !p_input )
p_new_input = input_ItemNewWithType( VLC_OBJECT(p_playlist), NULL,
psz_name, 0, NULL, -1, ITEM_TYPE_NODE );
- p_item = playlist_ItemNewFromInput( VLC_OBJECT(p_playlist),
+ p_item = playlist_ItemNewFromInput( p_playlist,
p_input ? p_input : p_new_input );
- if( !p_input )
+ if( p_new_input )
vlc_gc_decref( p_new_input );
if( p_item == NULL ) return NULL;
* \return VLC_SUCCESS or an error
*/
int playlist_NodeEmpty( playlist_t *p_playlist, playlist_item_t *p_root,
- vlc_bool_t b_delete_items )
+ bool b_delete_items )
{
+ PL_ASSERT_LOCKED;
int i;
if( p_root->i_children == -1 )
{
if( p_root->pp_children[i]->i_children > -1 )
{
playlist_NodeDelete( p_playlist, p_root->pp_children[i],
- b_delete_items , VLC_FALSE );
+ b_delete_items , false );
}
else if( b_delete_items )
{
* \return VLC_SUCCESS or an error
*/
int playlist_NodeDelete( playlist_t *p_playlist, playlist_item_t *p_root,
- vlc_bool_t b_delete_items, vlc_bool_t b_force )
+ bool b_delete_items, bool b_force )
{
+ PL_ASSERT_LOCKED;
int i;
if( p_root->i_children == -1 )
if( p_root->p_parent )
playlist_NodeRemoveItem( p_playlist, p_root, p_root->p_parent );
- playlist_ItemDelete( p_root );
+ playlist_ItemRelease( p_root );
}
return VLC_SUCCESS;
}
playlist_item_t *p_parent,
int i_position )
{
+ PL_ASSERT_LOCKED;
(void)p_playlist;
assert( p_parent && p_parent->i_children != -1 );
if( i_position == -1 ) i_position = p_parent->i_children ;
playlist_item_t *p_item,
playlist_item_t *p_parent )
{
+ PL_ASSERT_LOCKED;
(void)p_playlist;
for(int i= 0; i< p_parent->i_children ; i++ )
*/
int playlist_NodeChildrenCount( playlist_t *p_playlist, playlist_item_t*p_node)
{
+ PL_ASSERT_LOCKED;
int i;
int i_nb = 0;
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 )
void playlist_NodesPairCreate( playlist_t *p_playlist, const char *psz_name,
playlist_item_t **pp_node_cat,
playlist_item_t **pp_node_one,
- vlc_bool_t b_for_sd )
+ bool b_for_sd )
{
+ PL_ASSERT_LOCKED;
*pp_node_cat = playlist_NodeCreate( p_playlist, psz_name,
p_playlist->p_root_category, 0, NULL );
*pp_node_one = playlist_NodeCreate( p_playlist, psz_name,
/**
* Get the node in the preferred tree from a node in one of category
* or onelevel tree.
- * For example, for the SAP node, it will return the node in the category
- * tree if --playlist-tree is not set to never, because the SAP node prefers
- * category
*/
playlist_item_t * playlist_GetPreferredNode( playlist_t *p_playlist,
playlist_item_t *p_node )
{
+ PL_ASSERT_LOCKED;
int i;
if( p_node->p_parent == p_playlist->p_root_category )
{
- if( p_playlist->b_always_tree ||
- p_node->p_input->b_prefers_tree ) return p_node;
+ if( p_playlist->b_tree )
+ return p_node;
for( i = 0 ; i< p_playlist->p_root_onelevel->i_children; i++ )
{
if( p_playlist->p_root_onelevel->pp_children[i]->p_input->i_id ==
}
else if( p_node->p_parent == p_playlist->p_root_onelevel )
{
- if( p_playlist->b_never_tree || !p_node->p_input->b_prefers_tree )
+ if( !p_playlist->b_tree )
return p_node;
for( i = 0 ; i< p_playlist->p_root_category->i_children; i++ )
{
playlist_item_t *playlist_GetLastLeaf(playlist_t *p_playlist,
playlist_item_t *p_root )
{
+ PL_ASSERT_LOCKED;
int i;
playlist_item_t *p_item;
for ( i = p_root->i_children - 1; i >= 0; i-- )
return NULL;
}
-int playlist_GetAllEnabledChildren( playlist_t *p_playlist,
- playlist_item_t *p_node,
- playlist_item_t ***ppp_items )
-{
- int i_count = 0;
- playlist_item_t *p_next = NULL;
- while( 1 )
- {
- p_next = playlist_GetNextLeaf( p_playlist, p_node,
- p_next, VLC_TRUE, VLC_FALSE );
- if( p_next )
- INSERT_ELEM( *ppp_items, i_count, i_count, p_next );
- else
- break;
- }
- return i_count;
-}
-
/**
* Finds the next item to play
*
playlist_item_t *playlist_GetNextLeaf( playlist_t *p_playlist,
playlist_item_t *p_root,
playlist_item_t *p_item,
- vlc_bool_t b_ena, vlc_bool_t b_unplayed )
+ bool b_ena, bool b_unplayed )
{
+ PL_ASSERT_LOCKED;
playlist_item_t *p_next;
assert( p_root && p_root->i_children != -1 );
p_next = p_item;
while( 1 )
{
- vlc_bool_t b_ena_ok = VLC_TRUE, b_unplayed_ok = VLC_TRUE;
+ bool b_ena_ok = true, b_unplayed_ok = true;
p_next = GetNextItem( p_playlist, p_root, p_next );
if( !p_next || p_next == p_root )
break;
if( p_next->i_children == -1 )
{
if( b_ena && p_next->i_flags & PLAYLIST_DBL_FLAG )
- b_ena_ok = VLC_FALSE;
+ b_ena_ok = false;
if( b_unplayed && p_next->p_input->i_nb_played != 0 )
- b_unplayed_ok = VLC_FALSE;
+ b_unplayed_ok = false;
if( b_ena_ok && b_unplayed_ok ) break;
}
}
playlist_item_t *playlist_GetPrevLeaf( playlist_t *p_playlist,
playlist_item_t *p_root,
playlist_item_t *p_item,
- vlc_bool_t b_ena, vlc_bool_t b_unplayed )
+ bool b_ena, bool b_unplayed )
{
+ PL_ASSERT_LOCKED;
playlist_item_t *p_prev;
PL_DEBUG2( "finding previous os %s within %s", PLI_NAME( p_item ),
p_prev = p_item;
while( 1 )
{
- vlc_bool_t b_ena_ok = VLC_TRUE, b_unplayed_ok = VLC_TRUE;
+ bool b_ena_ok = true, b_unplayed_ok = true;
p_prev = GetPrevItem( p_playlist, p_root, p_prev );
if( !p_prev || p_prev == p_root )
break;
if( p_prev->i_children == -1 )
{
if( b_ena && p_prev->i_flags & PLAYLIST_DBL_FLAG )
- b_ena_ok = VLC_FALSE;
+ b_ena_ok = false;
if( b_unplayed && p_prev->p_input->i_nb_played != 0 )
- b_unplayed_ok = VLC_FALSE;
+ b_unplayed_ok = false;
if( b_ena_ok && b_unplayed_ok ) break;
}
}
{
playlist_item_t *p_parent = p_item->p_parent;
playlist_item_t *p_grandparent;
- vlc_bool_t b_found = VLC_FALSE;
+ bool b_found = false;
(void)p_playlist;
PL_DEBUG2( "parent %s found as child %i of grandparent %s",
p_parent->p_input->psz_name, i,
p_grandparent->p_input->psz_name );
- b_found = VLC_TRUE;
+ b_found = true;
break;
}
}
{
playlist_item_t *p_parent = p_item->p_parent;
playlist_item_t *p_grandparent;
- vlc_bool_t b_found = VLC_FALSE;
+ bool b_found = false;
(void)p_playlist;
{
if( p_parent == p_grandparent->pp_children[i] )
{
- b_found = VLC_TRUE;
+ b_found = true;
break;
}
}
projects / vlc / blobdiff