/*****************************************************************************
* item.c : Playlist item creation/deletion/add/removal functions
*****************************************************************************
- * Copyright (C) 1999-2007 the VideoLAN team
+ * Copyright (C) 1999-2007 VLC authors and VideoLAN
* $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Clément Stenac <zorglub@videolan.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
assert( p_item != NULL );
bool b_current = get_current_status_item( p_playlist ) == p_item;
- bool b_autostart = var_CreateGetBool( p_playlist, "playlist-autostart" );
+ bool b_autostart = var_GetBool( p_playlist, "playlist-autostart" );
bool b_stop = p_item->i_flags & PLAYLIST_SUBITEM_STOP_FLAG;
bool b_flat = false;
pos,
b_flat );
- if( !b_flat ) var_SetAddress( p_playlist, "leaf-to-parent", p_input );
+ if( !b_flat ) var_SetInteger( p_playlist, "leaf-to-parent", p_item->i_id );
//control playback only if it was the current playing item that got subitems
if( b_current )
int i_ret;
input_item_t *p_input;
- p_input = input_item_NewExt( p_playlist, psz_uri, psz_name,
+ p_input = input_item_NewExt( psz_uri, psz_name,
i_options, ppsz_options, i_option_flags,
i_duration );
if( p_input == NULL )
bool b_locked )
{
playlist_item_t *p_item;
- if( p_playlist->b_die ) return VLC_EGENERIC;
+
if( !pl_priv(p_playlist)->b_doing_ml )
PL_DEBUG( "adding item `%s' ( %s )", p_input->psz_name,
p_input->psz_uri );
PL_LOCK_IF( !b_locked );
p_item = playlist_ItemNewFromInput( p_playlist, p_input );
- if( p_item == NULL ) return VLC_ENOMEM;
+ if( p_item == NULL )
+ {
+ PL_UNLOCK_IF( !b_locked );
+ return VLC_ENOMEM;
+ }
AddItem( p_playlist, p_item,
b_playlist ? p_playlist->p_playing :
p_playlist->p_media_library , i_mode, i_pos );
assert( p_input );
assert( p_parent && p_parent->i_children != -1 );
- if( p_playlist->b_die )
- return NULL;
PL_LOCK_IF( !b_locked );
p_item = playlist_ItemNewFromInput( p_playlist, p_input );
- if( p_item == NULL ) return NULL;
+ if( p_item == NULL )
+ goto end;
AddItem( p_playlist, p_item, p_parent, i_mode, i_pos );
GoAndPreparse( p_playlist, i_mode, p_item );
+end:
PL_UNLOCK_IF( !b_locked );
return p_item;
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;
- int i = RecursiveAddIntoParent ( p_playlist, p_parent, p_node, i_pos, b_flat, &p_first_leaf );
- return i;
+ playlist_item_t *p_first_leaf = NULL;
+ return RecursiveAddIntoParent ( p_playlist, p_parent, p_node, i_pos, b_flat, &p_first_leaf );
}
add.i_item = i_item_id;
add.i_node = i_node_id;
- vlc_value_t val;
- val.p_address = &add;
+ var_SetAddress( p_playlist, "playlist-item-append", &add );
+}
+
+/**
+ * Get the duration of all items in a node.
+ */
+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 )
+ for( int i = 0; i < node->i_children; i++ )
+ {
+ input_item_t* p_input = node->pp_children[i]->p_input;
+ if ( p_input->i_type == ITEM_TYPE_NODE )
+ mt_duration += playlist_GetNodeDuration( node->pp_children[i] );
+ else
+ mt_duration += input_item_GetDuration( p_input );
+ }
- var_Set( p_playlist, "playlist-item-append", val );
+ return mt_duration;
}
/***************************************************************************
static void GoAndPreparse( playlist_t *p_playlist, int i_mode,
playlist_item_t *p_item )
{
+ playlist_private_t *sys = pl_priv(p_playlist);
+
PL_ASSERT_LOCKED;
if( (i_mode & PLAYLIST_GO ) )
{
- pl_priv(p_playlist)->request.b_request = true;
- pl_priv(p_playlist)->request.i_skip = 0;
- pl_priv(p_playlist)->request.p_item = p_item;
- if( pl_priv(p_playlist)->p_input )
- input_Stop( pl_priv(p_playlist)->p_input, true );
- pl_priv(p_playlist)->request.i_status = PLAYLIST_RUNNING;
- vlc_cond_signal( &pl_priv(p_playlist)->signal );
+ sys->request.b_request = true;
+ sys->request.i_skip = 0;
+ sys->request.p_item = p_item;
+ if( sys->p_input != NULL )
+ input_Stop( sys->p_input, true );
+ sys->request.i_status = PLAYLIST_RUNNING;
+ vlc_cond_signal( &sys->signal );
}
/* Preparse if no artist/album info, and hasn't been preparsed allready
and if user has some preparsing option (auto-preparse variable)
enabled*/
char *psz_artist = input_item_GetArtist( p_item->p_input );
char *psz_album = input_item_GetAlbum( p_item->p_input );
- if( pl_priv(p_playlist)->b_auto_preparse &&
- input_item_IsPreparsed( p_item->p_input ) == false &&
- ( EMPTY_STR( psz_artist ) || ( EMPTY_STR( psz_album ) ) )
- )
- playlist_PreparseEnqueue( p_playlist, p_item->p_input );
+ if( sys->p_preparser != NULL && !input_item_IsPreparsed( p_item->p_input )
+ && (EMPTY_STR(psz_artist) || EMPTY_STR(psz_album)) )
+ playlist_preparser_Push( sys->p_preparser, p_item->p_input );
free( psz_artist );
free( psz_album );
}
{
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;
-
- if( p_item->i_children > -1 )
- {
- return playlist_NodeDelete( p_playlist, p_item, true, false );
- }
+}
- pl_priv(p_playlist)->b_reset_currently_playing = true;
- var_SetInteger( p_playlist, "playlist-item-deleted", i_id );
+static int RecursiveAddIntoParent (
+ playlist_t *p_playlist, playlist_item_t *p_parent,
+ input_item_node_t *p_node, int i_pos, bool b_flat,
+ playlist_item_t **pp_first_leaf )
+{
+ *pp_first_leaf = NULL;
- /* Remove the item from the bank */
- ARRAY_BSEARCH( p_playlist->all_items,->i_id, int, i_id, i );
- if( i != -1 )
- ARRAY_REMOVE( p_playlist->all_items, i );
+ if( p_parent->i_children == -1 ) ChangeToNode( p_playlist, p_parent );
- ARRAY_BSEARCH( p_playlist->items,->i_id, int, i_id, i );
- if( i != -1 )
- ARRAY_REMOVE( p_playlist->items, i );
+ if( i_pos == PLAYLIST_END ) i_pos = p_parent->i_children;
- /* Check if it is the current item */
- if( get_current_status_item( p_playlist ) == p_item )
+ for( int i = 0; i < p_node->i_children; i++ )
{
- /* Stop it if we have to */
- if( b_stop )
- {
- playlist_Control( p_playlist, PLAYLIST_STOP, pl_Locked );
- msg_Info( p_playlist, "stopping playback" );
- }
- /* In any case, this item can't be the next one to be played ! */
- set_current_status_item( p_playlist, NULL );
- }
-
- ARRAY_BSEARCH( p_playlist->current,->i_id, int, i_id, i );
- if( i != -1 )
- ARRAY_REMOVE( p_playlist->current, i );
-
- PL_DEBUG( "deleting item `%s'", p_item->p_input->psz_name );
+ input_item_node_t *p_child_node = p_node->pp_children[i];
- /* Remove the item from its parent */
- playlist_NodeRemoveItem( p_playlist, p_item, p_item->p_parent );
-
- playlist_ItemRelease( p_item );
+ playlist_item_t *p_new_item = NULL;
+ bool b_children = p_child_node->i_children > 0;
- return VLC_SUCCESS;
-#endif
-}
+ //Create the playlist item represented by input node, if allowed.
+ if( !(b_flat && b_children) )
+ {
+ 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++;
+ }
+ //Recurse if any children
+ if( b_children )
+ {
+ //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;
+ }
-static int RecursiveAddIntoParent (
- playlist_t *p_playlist, playlist_item_t *p_parent,
- 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++ )
- {
- 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_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++;
- }
- //Recurse if any children
- if( b_children )
- {
- //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_new_item != NULL );
- if( i == 0 ) *pp_first_leaf = p_new_item;
- }
- return i_pos;
+ assert( p_new_item != NULL );
+ if( i == 0 ) *pp_first_leaf = p_new_item;
+ }
+ return i_pos;
}
static int RecursiveInsertCopy (
if( !(p_item->i_children != -1 && b_flat) )
{
- input_item_t *p_new_input = input_item_Copy( VLC_OBJECT(p_playlist),
- p_input );
+ input_item_t *p_new_input = input_item_Copy( p_input );
if( !p_new_input ) return i_pos;
playlist_item_t *p_new_item = NULL;
projects / vlc / blobdiff