/*****************************************************************************
* tree.c : Playlist tree walking functions
*****************************************************************************
- * Copyright (C) 1999-2004 the VideoLAN team
+ * Copyright (C) 1999-2007 the VideoLAN team
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include <assert.h>
#include "vlc_playlist.h"
#include "playlist_internal.h"
* Create a playlist node
*
* \param p_playlist the playlist
- * \paam psz_name the name of the node
+ * \param psz_name the name of the node
* \param p_parent the parent node to attach to or NULL if no attach
+ * \param p_flags miscellaneous flags
+ * \param p_input the input_item to attach to or NULL if it has to be created
* \return the new node
*/
-playlist_item_t * playlist_NodeCreate( playlist_t *p_playlist, const char *psz_name,
- playlist_item_t *p_parent )
+playlist_item_t * playlist_NodeCreate( playlist_t *p_playlist,
+ const char *psz_name,
+ playlist_item_t *p_parent, int i_flags,
+ input_item_t *p_input )
{
- input_item_t *p_input;
+ input_item_t *p_new_input = NULL;
playlist_item_t *p_item;
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;
- p_item = playlist_ItemNewFromInput( VLC_OBJECT(p_playlist), p_input );
- p_item->i_children = 0;
+
+ 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_input ? p_input : p_new_input );
+ if( p_new_input )
+ vlc_gc_decref( p_new_input );
if( p_item == NULL ) return NULL;
+ p_item->i_children = 0;
ARRAY_APPEND(p_playlist->all_items, p_item);
if( p_parent != NULL )
playlist_NodeAppend( p_playlist, p_item, p_parent );
playlist_SendAddNotify( p_playlist, p_item->i_id,
- p_parent ? p_parent->i_id : -1 );
+ p_parent ? p_parent->i_id : -1,
+ !( i_flags & PLAYLIST_NO_REBUILD ));
return p_item;
}
* \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 )
{
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 )
{
int i;
{
int i;
var_SetInteger( p_playlist, "item-deleted", p_root->i_id );
- ARRAY_BSEARCH( p_playlist->all_items, ->p_input->i_id, int,
- p_root->p_input->i_id, i );
+ ARRAY_BSEARCH( p_playlist->all_items, ->i_id, int,
+ p_root->i_id, i );
if( i != -1 )
ARRAY_REMOVE( p_playlist->all_items, i );
if( p_root->p_parent )
playlist_NodeRemoveItem( p_playlist, p_root, p_root->p_parent );
- playlist_ItemDelete( p_root );
+ /* Check if it is the current node */
+ if( p_playlist->status.p_node == p_root )
+ {
+ /* Hack we don't call playlist_Control for lock reasons */
+ p_playlist->request.i_status = PLAYLIST_STOPPED;
+ p_playlist->request.b_request = true;
+ p_playlist->request.p_item = NULL;
+ p_playlist->request.p_node = NULL;
+ msg_Info( p_playlist, "stopping playback" );
+ vlc_object_signal_maybe( VLC_OBJECT(p_playlist) );
+
+ PL_DEBUG( "marking %s for further deletion", PLI_NAME( p_root ) );
+ p_root->i_flags |= PLAYLIST_REMOVE_FLAG;
+ }
+ else
+ playlist_ItemDelete( p_root );
+
+
}
return VLC_SUCCESS;
}
playlist_item_t *p_parent,
int i_position )
{
+ (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 )
{
- int i;
- for( i= 0; i< p_parent->i_children ; i++ )
+ (void)p_playlist;
+
+ for(int i= 0; i< p_parent->i_children ; i++ )
{
if( p_parent->pp_children[i] == p_item )
{
/**
* Create a pair of nodes in the category and onelevel trees.
- * They share the same input ID.
- * \todo really share the input item
+ * They share the same input item.
* \param p_playlist the playlist
* \param psz_name the name of the nodes
* \param pp_node_cat pointer to return the node in category tree
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 )
{
*pp_node_cat = playlist_NodeCreate( p_playlist, psz_name,
- p_playlist->p_root_category );
+ p_playlist->p_root_category, 0, NULL );
*pp_node_one = playlist_NodeCreate( p_playlist, psz_name,
- p_playlist->p_root_onelevel );
- (*pp_node_one)->p_input->i_id = (*pp_node_cat)->p_input->i_id;
+ p_playlist->p_root_onelevel, 0,
+ (*pp_node_cat)->p_input );
if( b_for_sd )
{
(*pp_node_cat)->i_flags |= PLAYLIST_RO_FLAG;
/**
* 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
+ * or onelevel tree.
*/
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;
+ 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++ )
{
while( 1 )
{
p_next = playlist_GetNextLeaf( p_playlist, p_node,
- p_next, VLC_TRUE, VLC_FALSE );
+ p_next, true, false );
if( p_next )
INSERT_ELEM( *ppp_items, i_count, i_count, p_next );
else
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 )
{
playlist_item_t *p_next;
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 )
{
playlist_item_t *p_prev;
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;
if( p_parent != NULL )
{
p_grandparent = p_parent->p_parent;
- while( 1 )
+ while( p_grandparent )
{
int i;
for( i = 0 ; i< p_grandparent->i_children ; i++ )
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 != NULL )
{
{
if( p_parent == p_grandparent->pp_children[i] )
{
- b_found = VLC_TRUE;
+ b_found = true;
break;
}
}
}
return NULL;
}
-
-/* Dump the contents of a node */
-void playlist_NodeDump( playlist_t *p_playlist, playlist_item_t *p_item,
- int i_level )
-{
- char str[512];
- int i;
-
- if( i_level == 1 )
- {
- msg_Dbg( p_playlist, "%s (%i)",
- p_item->p_input->psz_name, p_item->i_children );
- }
-
- if( p_item->i_children == -1 )
- {
- return;
- }
-
- for( i = 0; i< p_item->i_children; i++ )
- {
- memset( str, 32, 512 );
- sprintf( str + 2 * i_level , "%s (%i)",
- p_item->pp_children[i]->p_input->psz_name,
- p_item->pp_children[i]->i_children );
- msg_Dbg( p_playlist, "%s",str );
- if( p_item->pp_children[i]->i_children >= 0 )
- {
- playlist_NodeDump( p_playlist, p_item->pp_children[i],
- i_level + 1 );
- }
- }
- return;
-}
projects / vlc / blobdiff