#include <vlc_common.h>
#include <assert.h>
#include <vlc_playlist.h>
+#include <vlc_rand.h>
#include "playlist_internal.h"
static void AddItem( playlist_t *p_playlist, playlist_item_t *p_item,
playlist_ItemGetByInput( p_playlist, p_input );
assert( p_item != NULL );
- playlist_item_t *p_parent = p_item->p_parent;
- assert( p_parent != NULL );
bool b_current = get_current_status_item( p_playlist ) == p_item;
bool b_autostart = var_CreateGetBool( p_playlist, "playlist-autostart" );
bool b_stop = p_item->i_flags & PLAYLIST_SUBITEM_STOP_FLAG;
+ bool b_flat = false;
+
p_item->i_flags &= ~PLAYLIST_SUBITEM_STOP_FLAG;
- int pos = 0;
- for( int i = 0; i < p_parent->i_children; i++ )
- {
- if( p_parent->pp_children[i] == p_item )
+ /* We will have to flatten the tree out if we are in "the playlist" node and
+ the user setting demands flat playlist */
+
+ if( !pl_priv(p_playlist)->b_tree ) {
+ playlist_item_t *p_up = p_item;
+ while( p_up->p_parent )
{
- pos = i;
- break;
+ if( p_up->p_parent == p_playlist->p_playing )
+ {
+ b_flat = true;
+ break;
+ }
+ p_up = p_up->p_parent;
}
}
- bool b_flat = false;
- playlist_item_t *p_up = p_item;
- while( p_up->p_parent )
+ int pos = 0;
+
+ /* If we have to flatten out, then take the item's position in the parent as
+ insertion point and delete the item */
+
+ if( b_flat )
{
- if( p_up->p_parent == p_playlist->p_playing )
+ playlist_item_t *p_parent = p_item->p_parent;
+ assert( p_parent != NULL );
+
+ int i;
+ for( i = 0; i < p_parent->i_children; i++ )
{
- if( !pl_priv(p_playlist)->b_tree ) b_flat = true;
- break;
+ if( p_parent->pp_children[i] == p_item )
+ {
+ pos = i;
+ break;
+ }
}
- p_up = p_up->p_parent;
- }
- if( b_flat )
- {
+ assert( i < p_parent->i_children );
+
playlist_DeleteItem( p_playlist, p_item, true );
- p_item = playlist_InsertInputItemTree( p_playlist, p_parent,
- p_new_root, pos, true );
+
+ p_item = p_parent;
}
else
- p_item = playlist_InsertInputItemTree( p_playlist, p_item,
- p_new_root, PLAYLIST_END, false );
+ {
+ pos = p_item->i_children >= 0 ? p_item->i_children : 0;
+ }
+
+ /* At this point:
+ "p_item" is the node where sub-items should be inserted,
+ "pos" is the insertion position in that node */
+
+ int last_pos = playlist_InsertInputItemTree( p_playlist,
+ p_item,
+ p_new_root,
+ pos,
+ b_flat );
if( !b_flat ) var_SetAddress( p_playlist, "leaf-to-parent", p_input );
+ //control playback only if it was the current playing item that got subitems
if( b_current )
{
- if( ( b_stop && !b_flat ) || !b_autostart )
+ if( last_pos == pos || ( b_stop && !b_flat ) || !b_autostart )
{
+ /* We stop, either because no sub-item was actually created, or some
+ flags/settings want us to do so at this point */
PL_UNLOCK;
playlist_Stop( p_playlist );
return;
}
else
{
+ /* Continue to play, either random or the first new item */
+ playlist_item_t *p_play_item;
+
+ if( var_GetBool( p_playlist, "random" ) )
+ {
+ unsigned rand_pos =
+ ((unsigned)vlc_mrand48()) % (last_pos - pos);
+ rand_pos += pos;
+ p_play_item = p_item->pp_children[rand_pos];
+ }
+ else
+ {
+ p_play_item = p_item->pp_children[pos];
+ /* NOTE: this is a work around the general bug:
+ if node-to-be-played contains sub-nodes, then second instead
+ of first leaf starts playing (only in case the leafs have just
+ been instered and playlist has not yet been rebuilt.)
+ */
+ while( p_play_item->i_children > 0 )
+ p_play_item = p_play_item->pp_children[0];
+ }
+
playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
- pl_Locked, get_current_status_node( p_playlist ), p_item );
+ pl_Locked,
+ get_current_status_node( p_playlist ),
+ p_play_item );
}
}
* \param b_flat TRUE if the new tree contents should be flattened into a list
* \return the first new leaf inserted (in playing order)
*/
-playlist_item_t *playlist_InsertInputItemTree (
+int playlist_InsertInputItemTree (
playlist_t *p_playlist, playlist_item_t *p_parent,
input_item_node_t *p_node, int i_pos, bool b_flat )
{
playlist_item_t *p_first_leaf = NULL;
- RecursiveAddIntoParent ( p_playlist, p_parent, p_node, i_pos, b_flat, &p_first_leaf );
- return p_first_leaf;
+ int i = RecursiveAddIntoParent ( p_playlist, p_parent, p_node, i_pos, b_flat, &p_first_leaf );
+ return i;
}
int playlist_DeleteItem( playlist_t * p_playlist, playlist_item_t *p_item,
bool b_stop )
{
+ assert( b_stop );
+ return playlist_NodeDelete( p_playlist, p_item, true, false );
+#if 0
int i;
int i_id = p_item->i_id;
PL_ASSERT_LOCKED;
playlist_ItemRelease( p_item );
return VLC_SUCCESS;
+#endif
}
static int RecursiveAddIntoParent (
input_item_node_t *p_node, int i_pos, bool b_flat,
playlist_item_t **pp_first_leaf )
{
+ *pp_first_leaf = NULL;
+
if( p_parent->i_children == -1 ) ChangeToNode( p_playlist, p_parent );
if( i_pos == PLAYLIST_END ) i_pos = p_parent->i_children;
for( int i = 0; i < p_node->i_children; i++ )
{
- playlist_item_t *p_child = NULL;
- if( b_flat ? p_node->pp_children[i]->i_children == 0 : 1 )
+ input_item_node_t *p_child_node = p_node->pp_children[i];
+
+ playlist_item_t *p_new_item = NULL;
+ bool b_children = p_child_node->i_children > 0;
+
+ //Create the playlist item represented by input node, if allowed.
+ if( !(b_flat && b_children) )
{
- p_child = playlist_NodeAddInput( p_playlist,
- p_node->pp_children[i]->p_item,
- p_parent,
- PLAYLIST_INSERT, i_pos,
- pl_Locked );
+ p_new_item = playlist_NodeAddInput( p_playlist,
+ p_child_node->p_item,
+ p_parent,
+ PLAYLIST_INSERT, i_pos,
+ pl_Locked );
+ if( !p_new_item ) return i_pos;
+
i_pos++;
}
- if( p_node->pp_children[i]->i_children > 0 )
+ //Recurse if any children
+ if( b_children )
{
- if( b_flat )
- {
- i_pos = RecursiveAddIntoParent(
- p_playlist, p_parent,
- p_node->pp_children[i], i_pos, true,
- &p_child );
- }
- else
- {
- RecursiveAddIntoParent( p_playlist, p_child,
- p_node->pp_children[i], 0, false,
- &p_child );
- }
+ //Substitute p_new_item for first child leaf
+ //(If flat, continue counting from current position)
+ int i_last_pos = RecursiveAddIntoParent(
+ p_playlist,
+ p_new_item ? p_new_item : p_parent,
+ p_child_node,
+ ( b_flat ? i_pos : 0 ),
+ b_flat,
+ &p_new_item );
+ //If flat, take position after recursion as current position
+ if( b_flat ) i_pos = i_last_pos;
}
- assert( p_child != NULL );
- if( i == 0 ) *pp_first_leaf = p_child;
+
+ assert( p_new_item != NULL );
+ if( i == 0 ) *pp_first_leaf = p_new_item;
}
return i_pos;
}
projects / vlc / blobdiff