#include <vlc/input.h>
#include "vlc_playlist.h"
-#define PLAYLIST_DEBUG 1
-
/************************************************************************
* Local prototypes
************************************************************************/
input_item_t *p_input;
playlist_item_t *p_item;
- if( !psz_name ) psz_name = strdup( _("Undefined") );
+ if( !psz_name ) psz_name = _("Undefined");
p_input = input_ItemNewWithType( VLC_OBJECT(p_playlist), NULL, psz_name,
0, NULL, -1, ITEM_TYPE_NODE );
p_input->i_id = ++p_playlist->i_last_input_id;
int playlist_NodeDelete( playlist_t *p_playlist, playlist_item_t *p_root,
vlc_bool_t b_delete_items, vlc_bool_t b_force )
{
- int i, i_top, i_bottom;
+ int i;
+
if( p_root->i_children == -1 )
{
return VLC_EGENERIC;
else
{
var_SetInteger( p_playlist, "item-deleted", p_root->p_input->i_id );
-
- i_bottom = 0; i_top = p_playlist->i_all_size - 1;
- i = i_top / 2;
- while( p_playlist->pp_all_items[i]->p_input->i_id !=
- p_root->p_input->i_id && i_top > i_bottom )
+ for( i = 0 ; i< p_playlist->i_all_size; i ++ )
{
- if( p_playlist->pp_all_items[i]->p_input->i_id <
+ if( p_playlist->pp_all_items[i]->p_input->i_id ==
p_root->p_input->i_id )
{
- i_bottom = i + 1;
+ REMOVE_ELEM( p_playlist->pp_all_items, p_playlist->i_all_size,
+ i );
+ break;
}
- else
- {
- i_top = i - 1;
- }
- i = i_bottom + ( i_top - i_bottom ) / 2;
}
- if( p_playlist->pp_all_items[i]->p_input->i_id ==
- p_root->p_input->i_id )
+
+ /* Remove the item from its parent */
+ if( p_root->p_parent )
{
- REMOVE_ELEM( p_playlist->pp_all_items, p_playlist->i_all_size, i );
+ playlist_NodeRemoveItem( p_playlist, p_root, p_root->p_parent );
}
+
playlist_ItemDelete( p_root );
}
return VLC_SUCCESS;
p_playlist->p_root_onelevel );
(*pp_node_one)->i_flags |= PLAYLIST_RO_FLAG;
(*pp_node_one)->i_flags |= PLAYLIST_SKIP_FLAG;
+
+ (*pp_node_one)->p_input->i_id = (*pp_node_cat)->p_input->i_id;
}
+playlist_item_t * playlist_GetPreferredNode( playlist_t *p_playlist,
+ playlist_item_t *p_node )
+{
+ 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;
+ 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 ==
+ p_node->p_input->i_id )
+ return p_playlist->p_root_onelevel->pp_children[i];
+ }
+ }
+ else if( p_node->p_parent == p_playlist->p_root_onelevel )
+ {
+ if( p_playlist->b_never_tree || !p_node->p_input->b_prefers_tree )
+ return p_node;
+ for( i = 0 ; i< p_playlist->p_root_category->i_children; i++ )
+ {
+ if( p_playlist->p_root_category->pp_children[i]->p_input->i_id ==
+ p_node->p_input->i_id )
+ return p_playlist->p_root_category->pp_children[i];
+ }
+ }
+ return NULL;
+}
/**********************************************************************
* Tree walking functions
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_TRUE );
+ 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 )
+ playlist_item_t *p_item,
+ vlc_bool_t b_ena, vlc_bool_t b_unplayed )
{
playlist_item_t *p_next;
-#ifdef PLAYLIST_DEBUG
- if( p_item != NULL )
- msg_Dbg( p_playlist, "finding next of %s within %s",
- p_item->p_input->psz_name, p_root->p_input->psz_name );
- else
- msg_Dbg( p_playlist, "finding something to play within %s",
- p_root->p_input->psz_name );
-#endif
-
assert( p_root && p_root->i_children != -1 );
- /* Now, walk the tree until we find a suitable next item */
- p_next = p_item;
- do
- {
- p_next = GetNextItem( p_playlist, p_root, p_next );
- } while ( p_next && p_next != p_root && p_next->i_children != -1 );
-
-#ifdef PLAYLIST_DEBUG
- if( p_next == NULL )
- msg_Dbg( p_playlist, "At end of node" );
-#endif
- return p_next;
-}
-
-playlist_item_t *playlist_GetNextEnabledLeaf( playlist_t *p_playlist,
- playlist_item_t *p_root,
- playlist_item_t *p_item )
-{
- playlist_item_t *p_next;
-
#ifdef PLAYLIST_DEBUG
if( p_item != NULL )
msg_Dbg( p_playlist, "finding next of %s within %s",
p_root->p_input->psz_name );
#endif
- assert( p_root && p_root->i_children != -1 );
-
/* Now, walk the tree until we find a suitable next item */
p_next = p_item;
- do
+ while( 1 )
{
+ vlc_bool_t b_ena_ok = VLC_TRUE, b_unplayed_ok = VLC_TRUE;
p_next = GetNextItem( p_playlist, p_root, p_next );
- } while ( p_next && p_next != p_root &&
- !( p_next->i_children == -1 &&
- !(p_next->i_flags & PLAYLIST_DBL_FLAG) ) );
-
+ 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;
+ if( b_unplayed && p_next->p_input->i_nb_played != 0 )
+ b_unplayed_ok = VLC_FALSE;
+ if( b_ena_ok && b_unplayed_ok ) break;
+ }
+ }
#ifdef PLAYLIST_DEBUG
if( p_next == NULL )
msg_Dbg( p_playlist, "At end of node" );
*/
playlist_item_t *playlist_GetPrevLeaf( playlist_t *p_playlist,
playlist_item_t *p_root,
- playlist_item_t *p_item )
+ playlist_item_t *p_item,
+ vlc_bool_t b_ena, vlc_bool_t b_unplayed )
{
playlist_item_t *p_prev;
/* Now, walk the tree until we find a suitable previous item */
p_prev = p_item;
- do
+ while( 1 )
{
+ vlc_bool_t b_ena_ok = VLC_TRUE, b_unplayed_ok = VLC_TRUE;
p_prev = GetPrevItem( p_playlist, p_root, p_prev );
- } while ( p_prev && p_prev != p_root && p_prev->i_children != -1 );
-
+ 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;
+ if( b_unplayed && p_prev->p_input->i_nb_played != 0 )
+ b_unplayed_ok = VLC_FALSE;
+ if( b_ena_ok && b_unplayed_ok ) break;
+ }
+ }
#ifdef PLAYLIST_DEBUG
if( p_prev == NULL )
msg_Dbg( p_playlist, "At beginning of node" );
if( i+1 >= p_parent->i_children )
{
/* Was already the last sibling. Look for uncles */
-#ifdef PLAYLIST_DEBUG
- msg_Dbg( p_playlist, "Current item is the last of the node,"
- "looking for uncle from %s",
- p_parent->p_input->psz_name );
-#endif
+ PL_DEBUG( "Current item is the last of the node,"
+ "looking for uncle from %s",
+ p_parent->p_input->psz_name );
+
if( p_parent == p_root )
{
-#ifdef PLAYLIST_DEBUG
- msg_Dbg( p_playlist, "Already at root" );
+ PL_DEBUG( "already at root" );
return NULL;
-#endif
}
return GetNextUncle( p_playlist, p_item, p_root );
}
{
if( p_parent == p_grandparent->pp_children[i] )
{
-#ifdef PLAYLIST_DEBUG
- msg_Dbg( p_playlist, "parent %s found as child %i of "
- "grandparent %s",
- p_parent->p_input->psz_name, i,
- p_grandparent->p_input->psz_name );
-#endif
+ PL_DEBUG( "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;
break;
}
if( i-1 < 0 )
{
/* Was already the first sibling. Look for uncles */
-#ifdef PLAYLIST_DEBUG
- msg_Dbg( p_playlist, "Current item is the first of the node,"
- "looking for uncle from %s",
- p_parent->p_input->psz_name );
-#endif
+ PL_DEBUG( "Current item is the first of the node,"
+ "looking for uncle from %s",
+ p_parent->p_input->psz_name );
return GetPrevUncle( p_playlist, p_item, p_root );
}
else
projects / vlc / blobdiff