/*****************************************************************************
- * item-ext.c : Exported playlist item functions
+ * item-ext.c : Playlist item management functions (act on the playlist)
*****************************************************************************
* Copyright (C) 1999-2004 VideoLAN
- * $Id: item-ext.c,v 1.5 2004/01/07 19:20:30 gbazin Exp $
+ * $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Clément Stenac <zorglub@videolan.org>
#include <string.h> /* strerror() */
#include <vlc/vlc.h>
-#include <vlc/vout.h>
-#include <vlc/sout.h>
+#include <vlc/input.h>
#include "vlc_playlist.h"
+/***************************************************************************
+ * Item creation/addition functions
+ ***************************************************************************/
+
/**
- * Add a MRL into the playlist.
+ * Add a MRL into the playlist, duration and options given
*
* \param p_playlist the playlist to add into
* \param psz_uri the mrl to add to the playlist
* PLAYLIST_END the item will be added at the end of the playlist
* regardless of it's size
* \param i_duration length of the item in milliseconds.
- * \return the position of the new item
+ * \param ppsz_options an array of options
+ * \param i_options the number of options
+ * \return The id of the playlist item
*/
-int playlist_AddWDuration( playlist_t *p_playlist, const char * psz_uri,
- const char *psz_name, int i_mode, int i_pos,
- mtime_t i_duration )
+int playlist_AddExt( playlist_t *p_playlist, const char * psz_uri,
+ const char *psz_name, int i_mode, int i_pos,
+ mtime_t i_duration, const char **ppsz_options,
+ int i_options )
{
- playlist_item_t * p_item;
+ playlist_item_t *p_item;
+ p_item = playlist_ItemNew( p_playlist , psz_uri, psz_name );
- p_item = malloc( sizeof( playlist_item_t ) );
if( p_item == NULL )
{
- msg_Err( p_playlist, "out of memory" );
- }
- if( psz_uri == NULL)
- {
- msg_Err( p_playlist, "Not adding NULL item");
+ msg_Err( p_playlist, "unable to add item to playlist" );
return -1;
}
- p_item->psz_uri = strdup( psz_uri );
- if( psz_name != NULL )
- {
- p_item->psz_name = strdup( psz_name );
- }
- else
+
+ p_item->input.i_duration = i_duration;
+ p_item->input.i_options = i_options;
+ p_item->input.ppsz_options = NULL;
+
+ for( p_item->input.i_options = 0; p_item->input.i_options < i_options;
+ p_item->input.i_options++ )
{
- p_item->psz_name = strdup ( psz_uri );
- }
- p_item->i_status = 0;
- p_item->b_autodeletion = VLC_FALSE;
- p_item->b_enabled = VLC_TRUE;
- p_item->i_group = PLAYLIST_TYPE_MANUAL;
- p_item->i_duration = i_duration;
+ if( !p_item->input.i_options )
+ {
+ p_item->input.ppsz_options = malloc( i_options * sizeof(char *) );
+ if( !p_item->input.ppsz_options ) break;
+ }
- p_item->pp_categories = NULL;
- p_item->i_categories = 0;
+ p_item->input.ppsz_options[p_item->input.i_options] =
+ strdup( ppsz_options[p_item->input.i_options] );
+ }
- playlist_CreateItemCategory( p_item, _("General") );
- playlist_CreateItemCategory( p_item, _("Options") );
return playlist_AddItem( p_playlist, p_item, i_mode, i_pos );
}
* \param i_pos the position in the playlist where to add. If this is
* PLAYLIST_END the item will be added at the end of the playlist
* regardless of it's size
- * \return the position of the new item
+ * \return The id of the playlist item
*/
-int playlist_Add( playlist_t *p_playlist, const char * psz_uri,
- const char *psz_name, int i_mode, int i_pos )
+int playlist_Add( playlist_t *p_playlist, const char *psz_uri,
+ const char *psz_name, int i_mode, int i_pos )
{
- return playlist_AddWDuration ( p_playlist, psz_uri, psz_name, i_mode, i_pos,
- -1 );
+ return playlist_AddExt( p_playlist, psz_uri, psz_name, i_mode, i_pos,
+ -1, NULL, 0 );
}
/**
- * Search the position of an item by its id
- * \param p_playlist the playlist
- * \param i_id the id to find
- * \return the position, or -1 on failure
+ * Add a playlist item into a playlist
+ *
+ * \param p_playlist the playlist to insert into
+ * \param p_item the playlist item to insert
+ * \param i_mode the mode used when adding
+ * \param i_pos the possition in the playlist where to add. If this is
+ * PLAYLIST_END the item will be added at the end of the playlist
+ * regardless of it's size
+ * \return The id of the playlist item
*/
-int playlist_GetPositionById( playlist_t * p_playlist , int i_id )
+int playlist_AddItem( playlist_t *p_playlist, playlist_item_t *p_item,
+ int i_mode, int i_pos)
{
- int i;
- for( i = 0 ; i < p_playlist->i_size ; i++ )
+ vlc_value_t val;
+ vlc_bool_t b_end = VLC_FALSE;
+ playlist_view_t *p_view = NULL;
+
+ vlc_mutex_lock( &p_playlist->object_lock );
+
+ /*
+ * CHECK_INSERT : checks if the item is already enqued before
+ * enqueing it
+ */
+
+ /* That should not change */
+ if ( i_mode & PLAYLIST_CHECK_INSERT )
{
- if( p_playlist->pp_items[i]->i_id == i_id )
+ int j;
+
+ if ( p_playlist->pp_items )
{
- return i;
- }
+ for ( j = 0; j < p_playlist->i_size; j++ )
+ {
+ if ( !strcmp( p_playlist->pp_items[j]->input.psz_uri,
+ p_item->input.psz_uri ) )
+ {
+ playlist_ItemDelete( p_item );
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ return -1;
+ }
+ }
+ }
+ i_mode &= ~PLAYLIST_CHECK_INSERT;
+ i_mode |= PLAYLIST_APPEND;
}
- return -1;
-}
+ msg_Dbg( p_playlist, "adding playlist item `%s' ( %s )",
+ p_item->input.psz_name, p_item->input.psz_uri );
-/**
- * Search an item by its id
- * \param p_playlist the playlist
- * \param i_id the id to find
- * \return the item, or NULL on failure
- */
-playlist_item_t * playlist_GetItemById( playlist_t * p_playlist , int i_id )
-{
- int i;
- for( i = 0 ; i < p_playlist->i_size ; i++ )
+ p_item->input.i_id = ++p_playlist->i_last_id;
+
+ /* Do a few boundary checks and allocate space for the item */
+ if( i_pos == PLAYLIST_END )
{
- if( p_playlist->pp_items[i]->i_id == i_id )
+ b_end = VLC_TRUE;
+ if( i_mode & PLAYLIST_INSERT )
{
- return p_playlist->pp_items[i];
+ i_mode &= ~PLAYLIST_INSERT;
+ i_mode |= PLAYLIST_APPEND;
}
- }
- return NULL;
-}
-
-/**********************************************************************
- * playlist_item_t structure accessors
- * These functions give access to the fields of the playlist_item_t
- * structure
- **********************************************************************/
-/**
- * Set the group of a playlist item
- *
- * \param p_playlist the playlist
- * \param i_item the item of which we change the group (position)
- * \param i_group the new group
- * \return 0 on success, -1 on failure
- */
-int playlist_SetGroup( playlist_t *p_playlist, int i_item, int i_group )
-{
- char *psz_group;
- /* Check the existence of the playlist */
- if( p_playlist == NULL)
- {
- return -1;
- }
- /* Get a correct item */
- if( i_item >= 0 && i_item < p_playlist->i_size )
- {
+ i_pos = p_playlist->i_size - 1;
}
- else if( p_playlist->i_size > 0 )
+
+ if( !(i_mode & PLAYLIST_REPLACE)
+ || i_pos < 0 || i_pos >= p_playlist->i_size )
{
- i_item = p_playlist->i_index;
+ /* Additional boundary checks */
+ if( i_mode & PLAYLIST_APPEND )
+ {
+ i_pos++;
+ }
+
+ if( i_pos < 0 )
+ {
+ i_pos = 0;
+ }
+ else if( i_pos > p_playlist->i_size )
+ {
+ i_pos = p_playlist->i_size;
+ }
+
+ INSERT_ELEM( p_playlist->pp_items, p_playlist->i_size, i_pos, p_item );
+ p_playlist->i_enabled ++;
+
+ /* We update the ALL view directly */
+ playlist_ViewUpdate( p_playlist, VIEW_ALL );
+
+ /* Add the item to the General category */
+ if( b_end == VLC_TRUE )
+ {
+ playlist_NodeAppend( p_playlist, VIEW_CATEGORY, p_item,
+ p_playlist->p_general );
+ }
+ else
+ {
+ playlist_NodeInsert( p_playlist, VIEW_CATEGORY, p_item,
+ p_playlist->p_general, i_pos );
+ }
+ p_view = playlist_ViewFind( p_playlist, VIEW_ALL );
+ playlist_ItemAddParent( p_item, VIEW_ALL, p_view->p_root );
+
+ /* Also add the item to the "simple" view */
+ p_view = playlist_ViewFind( p_playlist, VIEW_SIMPLE );
+
+ if( b_end == VLC_TRUE )
+ {
+ playlist_NodeAppend( p_playlist, VIEW_SIMPLE,p_item,
+ p_view->p_root );
+ }
+ else
+ {
+ playlist_NodeInsert( p_playlist, VIEW_SIMPLE,p_item,
+ p_view->p_root, i_pos );
+ }
+
+ /* FIXME : Update sorted views */
+
+ if( p_playlist->i_index >= i_pos )
+ {
+ p_playlist->i_index++;
+ }
}
else
{
- return -1;
+ msg_Err( p_playlist, "Insert mode not implemented" );
}
- psz_group = playlist_FindGroup( p_playlist , i_group );
- if( psz_group != NULL)
+ if( (i_mode & PLAYLIST_GO ) && p_view )
{
- p_playlist->pp_items[i_item]->i_group = i_group ;
+ p_playlist->request.b_request = VLC_TRUE;
+ /* FIXME ... */
+ p_playlist->request.i_view = VIEW_SIMPLE;
+ p_playlist->request.p_node = p_view->p_root;
+ p_playlist->request.p_item = p_item;
+
+ if( p_playlist->p_input )
+ {
+ input_StopThread( p_playlist->p_input );
+ }
+ p_playlist->status.i_status = PLAYLIST_RUNNING;
}
- return 0;
+
+ vlc_mutex_unlock( &p_playlist->object_lock );
+
+ val.b_bool = VLC_TRUE;
+ var_Set( p_playlist, "intf-change", val );
+
+ return p_item->input.i_id;
}
+
/**
- * Set the name of a playlist item
+ * Add a playlist item to a given node (in the category view )
*
- * \param p_playlist the playlist
- * \param i_item the item of which we change the name
- * \param psz_name the new name
- * \return VLC_SUCCESS on success, VLC_EGENERIC on failure
+ * \param p_playlist the playlist to insert into
+ * \param p_item the playlist item to insert
+ * \param i_view the view for which to add or TODO: ALL_VIEWS
+ * \param p_parent the parent node
+ * \param i_mode the mode used when adding
+ * \param i_pos the possition in the node where to add. If this is
+ * PLAYLIST_END the item will be added at the end of the node
+ ** \return The id of the playlist item
*/
-int playlist_SetName( playlist_t *p_playlist, int i_item, char *psz_name )
+int playlist_NodeAddItem( playlist_t *p_playlist, playlist_item_t *p_item,
+ int i_view,playlist_item_t *p_parent,
+ int i_mode, int i_pos)
{
vlc_value_t val;
+ int i_position;
+ playlist_view_t *p_view;
- /* Check the existence of the playlist */
- if( p_playlist == NULL)
- {
- return -1;
- }
- /* Get a correct item */
- if( i_item >= 0 && i_item < p_playlist->i_size )
+ vlc_mutex_lock( &p_playlist->object_lock );
+
+ /* Sanity checks */
+ if( !p_parent || p_parent->i_children == -1 )
{
+ msg_Err( p_playlist, "invalid node" );
}
- else if( p_playlist->i_size > 0 )
+
+ /*
+ * CHECK_INSERT : checks if the item is already enqued before
+ * enqueing it
+ */
+ if ( i_mode & PLAYLIST_CHECK_INSERT )
{
- i_item = p_playlist->i_index;
+ int j;
+
+ if ( p_playlist->pp_items )
+ {
+ for ( j = 0; j < p_playlist->i_size; j++ )
+ {
+ if ( !strcmp( p_playlist->pp_items[j]->input.psz_uri,
+ p_item->input.psz_uri ) )
+ {
+ playlist_ItemDelete( p_item );
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ return -1;
+ }
+ }
+ }
+ i_mode &= ~PLAYLIST_CHECK_INSERT;
+ i_mode |= PLAYLIST_APPEND;
}
- else
+
+ msg_Dbg( p_playlist, "adding playlist item `%s' ( %s )",
+ p_item->input.psz_name, p_item->input.psz_uri );
+
+ p_item->input.i_id = ++p_playlist->i_last_id;
+
+ /* First, add the item at the right position in the item bank */
+ /* WHY THAT ? */
+ //i_position = p_playlist->i_index == -1 ? 0 : p_playlist->i_index;
+ i_position = p_playlist->i_size ;
+
+ INSERT_ELEM( p_playlist->pp_items,
+ p_playlist->i_size,
+ i_position,
+ p_item );
+ p_playlist->i_enabled ++;
+
+ /* TODO: Handle modes */
+ playlist_NodeAppend( p_playlist, i_view, p_item, p_parent );
+
+ /* We update the ALL view directly */
+ p_view = playlist_ViewFind( p_playlist, VIEW_ALL );
+ playlist_ItemAddParent( p_item, VIEW_ALL, p_view->p_root );
+ playlist_ViewUpdate( p_playlist, VIEW_ALL );
+
+ /* TODO : Update sorted views*/
+
+ if( i_mode & PLAYLIST_GO )
{
- return -1;
+ p_playlist->request.b_request = VLC_TRUE;
+ p_playlist->request.i_view = VIEW_CATEGORY;
+ p_playlist->request.p_node = p_parent;
+ p_playlist->request.p_item = p_item;
+ if( p_playlist->p_input )
+ {
+ input_StopThread( p_playlist->p_input );
+ }
+ p_playlist->status.i_status = PLAYLIST_RUNNING;
}
- if( p_playlist->pp_items[i_item]->psz_name)
- free( p_playlist->pp_items[i_item]->psz_name );
+ vlc_mutex_unlock( &p_playlist->object_lock );
- if( psz_name )
- p_playlist->pp_items[i_item]->psz_name = strdup( psz_name );
+ val.b_bool = VLC_TRUE;
+ var_Set( p_playlist, "intf-change", val );
- val.b_bool = i_item;
- var_Set( p_playlist, "item-change", val );
- return VLC_SUCCESS;
+ return p_item->input.i_id;
}
+/***************************************************************************
+ * Item search functions
+ ***************************************************************************/
+
/**
- * Set the duration of a playlist item
+ * Search the position of an item by its id
+ * This function must be entered with the playlist lock
*
* \param p_playlist the playlist
- * \param i_item the item of which we change the name
- * \param i_duration the duration to set
- * \return VLC_SUCCESS on success, VLC_EGENERIC on failure
+ * \param i_id the id to find
+ * \return the position, or VLC_EGENERIC on failure
*/
-int playlist_SetDuration( playlist_t *p_playlist, int i_item, int i_duration )
+int playlist_GetPositionById( playlist_t * p_playlist , int i_id )
{
- char psz_buffer[MSTRTIME_MAX_SIZE];
- vlc_value_t val;
-
- /* Check the existence of the playlist */
- if( p_playlist == NULL)
+ int i;
+ for( i = 0 ; i < p_playlist->i_size ; i++ )
{
- return -1;
+ if( p_playlist->pp_items[i]->input.i_id == i_id )
+ {
+ return i;
+ }
}
- /* Get a correct item */
- if( i_item >= 0 && i_item < p_playlist->i_size )
+ return VLC_EGENERIC;
+}
+
+
+/**
+ * Search an item by its position
+ * This function must be entered with the playlist lock
+ *
+ * \param p_playlist the playlist
+ * \param i_pos the position of the item to find
+ * \return the item, or NULL on failure
+ */
+playlist_item_t * playlist_ItemGetByPos( playlist_t * p_playlist , int i_pos )
+{
+ if( i_pos >= 0 && i_pos < p_playlist->i_size)
{
+ return p_playlist->pp_items[i_pos];
}
- else if( p_playlist->i_size > 0 )
+ else if( p_playlist->i_size > 0)
{
- i_item = p_playlist->i_index;
+ return p_playlist->pp_items[p_playlist->i_index];
}
else
{
- return VLC_EGENERIC;
+ return NULL;
}
+}
- p_playlist->pp_items[i_item]->i_duration = i_duration;
- if( i_duration != -1 )
+/**
+ * Search an item by its id
+ *
+ * \param p_playlist the playlist
+ * \param i_id the id to find
+ * \return the item, or NULL on failure
+ */
+playlist_item_t * playlist_ItemGetById( playlist_t * p_playlist , int i_id )
+{
+ int i;
+ for( i = 0 ; i < p_playlist->i_size ; i++ )
{
- secstotimestr( psz_buffer, i_duration/1000000 );
+ if( p_playlist->pp_items[i]->input.i_id == i_id )
+ {
+ return p_playlist->pp_items[i];
+ }
}
- else
+ return NULL;
+}
+
+/**
+ * Search an item by its input_item_t
+ *
+ * \param p_playlist the playlist
+ * \param p_item the input_item_t to find
+ * \return the item, or NULL on failure
+ */
+playlist_item_t * playlist_ItemGetByInput( playlist_t * p_playlist ,
+ input_item_t *p_item )
+{
+ int i;
+ for( i = 0 ; i < p_playlist->i_size ; i++ )
{
- memcpy( psz_buffer, "--:--:--", sizeof("--:--:--") );
+ if( &p_playlist->pp_items[i]->input == p_item )
+ {
+ return p_playlist->pp_items[i];
+ }
}
- playlist_AddInfo( p_playlist, i_item, _("General") , _("Duration"),
- "%s", psz_buffer );
-
- val.b_bool = i_item;
- var_Set( p_playlist, "item-change", val );
- return VLC_SUCCESS;
+ return NULL;
}
-/**********************************************************************
- * Actions on existing playlist items
- **********************************************************************/
+/***********************************************************************
+ * Misc functions
+ ***********************************************************************/
+
/**
- * delete an item from a playlist.
+ * Transform an item to a node
*
- * \param p_playlist the playlist to remove from.
- * \param i_pos the position of the item to remove
- * \return returns 0
+ * \param p_playlist the playlist object
+ * \param p_item the item to transform
+ * \return nothing
*/
-int playlist_Delete( playlist_t * p_playlist, int i_pos )
+void playlist_ItemToNode( playlist_t *p_playlist,playlist_item_t *p_item )
{
- vlc_value_t val;
- int i,j;
-
- /* if i_pos is the current played item, playlist should stop playing it */
- if( ( p_playlist->i_status == PLAYLIST_RUNNING) && (p_playlist->i_index == i_pos) )
+ int i = 0;
+ if( p_item->i_children == -1 )
{
- playlist_Command( p_playlist, PLAYLIST_STOP, 0 );
+ p_item->i_children = 0;
}
vlc_mutex_lock( &p_playlist->object_lock );
- if( i_pos >= 0 && i_pos < p_playlist->i_size )
- {
- playlist_item_t *p_item = p_playlist->pp_items[i_pos];
-
- msg_Dbg( p_playlist, "deleting playlist item « %s »",
- p_item->psz_name );
-
- if( p_item->psz_name )
- {
- free( p_item->psz_name );
- }
- if( p_item->psz_uri )
- {
- free( p_item->psz_uri );
- }
-
- /* Free the info categories. Welcome to the segfault factory */
- if( p_item->i_categories > 0 )
- {
- for( i = 0; i < p_item->i_categories; i++ )
- {
- for( j= 0 ; j < p_item->pp_categories[i]->i_infos; j++)
- {
- if( p_item->pp_categories[i]->pp_infos[j]->psz_name)
- {
- free( p_item->pp_categories[i]->
- pp_infos[j]->psz_name);
- }
- if( p_item->pp_categories[i]->pp_infos[j]->psz_value)
- {
- free( p_item->pp_categories[i]->
- pp_infos[j]->psz_value);
- }
- free( p_item->pp_categories[i]->pp_infos[j] );
- }
- if( p_item->pp_categories[i]->i_infos )
- free( p_item->pp_categories[i]->pp_infos );
- if( p_item->pp_categories[i]->psz_name)
- {
- free( p_item->pp_categories[i]->psz_name );
- }
- free( p_item->pp_categories[i] );
- }
- free( p_item->pp_categories );
- }
-
- /* XXX: what if the item is still in use? */
- free( p_item );
-
- if( i_pos <= p_playlist->i_index )
+ /* Remove it from the array of available items */
+ for( i = 0 ; i < p_playlist->i_size ; i++ )
+ {
+ if( p_item == p_playlist->pp_items[i] )
{
- p_playlist->i_index--;
+ REMOVE_ELEM( p_playlist->pp_items, p_playlist->i_size, i );
}
-
- /* Renumber the playlist */
- REMOVE_ELEM( p_playlist->pp_items,
- p_playlist->i_size,
- i_pos );
- if( p_playlist->i_enabled > 0 )
- p_playlist->i_enabled--;
}
-
vlc_mutex_unlock( &p_playlist->object_lock );
- val.b_bool = VLC_TRUE;
- var_Set( p_playlist, "intf-change", val );
-
- return 0;
+ /* Handle the parents
+ * Nothing to do ! */
}
-
-
/**
- * Clear all playlist items
+ * delete an item from a playlist.
*
- * \param p_playlist the playlist to be cleared.
- * \return returns 0
+ * \param p_playlist the playlist to remove from.
+ * \param i_id the identifier of the item to delete
+ * \return returns VLC_SUCCESS or an error
*/
-int playlist_Clear( playlist_t * p_playlist ) {
+int playlist_Delete( playlist_t * p_playlist, int i_id )
+{
+ vlc_value_t val;
+ int i;
- while( p_playlist->i_groups > 0 )
+ playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id );
+
+ if( p_item == NULL )
{
- playlist_DeleteGroup( p_playlist, p_playlist->pp_groups[0]->i_id );
+ return VLC_EGENERIC;
}
- while( p_playlist->i_size > 0 )
+ /* Check if it is the current item */
+ if( p_playlist->status.p_item == p_item )
{
- playlist_Delete( p_playlist, 0 );
+ playlist_Control( p_playlist, PLAYLIST_STOP );
+ p_playlist->status.p_item = NULL;
}
- return 0;
-}
-
-/**
- * Disables a playlist item
- *
- * \param p_playlist the playlist to disable from.
- * \param i_pos the position of the item to disable
- * \return returns 0
- */
-int playlist_Disable( playlist_t * p_playlist, int i_pos )
-{
- vlc_value_t val;
vlc_mutex_lock( &p_playlist->object_lock );
+ msg_Dbg( p_playlist, "deleting playlist item `%s'",
+ p_item->input.psz_name );
- if( i_pos >= 0 && i_pos < p_playlist->i_size )
+ /* Remove the item from all its parent nodes */
+ for ( i= 0 ; i < p_item->i_parents ; i++ )
{
- msg_Dbg( p_playlist, "disabling playlist item « %s »",
- p_playlist->pp_items[i_pos]->psz_name );
-
- if( p_playlist->pp_items[i_pos]->b_enabled == VLC_TRUE )
- p_playlist->i_enabled--;
- p_playlist->pp_items[i_pos]->b_enabled = VLC_FALSE;
+ playlist_NodeRemoveItem( p_playlist, p_item,
+ p_item->pp_parents[i]->p_parent );
+ if( p_item->pp_parents[i]->i_view == VIEW_ALL )
+ {
+ p_playlist->i_size--;
+ }
}
+ /* TODO : Update views */
+
+ playlist_ItemDelete( p_item );
+
vlc_mutex_unlock( &p_playlist->object_lock );
- val.b_bool = i_pos;
- var_Set( p_playlist, "item-change", val );
+ val.b_bool = VLC_TRUE;
+ var_Set( p_playlist, "intf-change", val );
- return 0;
+ return VLC_SUCCESS;
}
/**
- * Enables a playlist item
+ * Clear all playlist items
*
- * \param p_playlist the playlist to enable from.
- * \param i_pos the position of the item to enable
+ * \param p_playlist the playlist to be cleared.
* \return returns 0
*/
-int playlist_Enable( playlist_t * p_playlist, int i_pos )
+int playlist_Clear( playlist_t * p_playlist )
{
- vlc_value_t val;
- vlc_mutex_lock( &p_playlist->object_lock );
-
- if( i_pos >= 0 && i_pos < p_playlist->i_size )
+ int i;
+ for( i = p_playlist->i_size; i > 0 ; i-- )
{
- msg_Dbg( p_playlist, "enabling playlist item « %s »",
- p_playlist->pp_items[i_pos]->psz_name );
-
- if( p_playlist->pp_items[i_pos]->b_enabled == VLC_FALSE )
- p_playlist->i_enabled++;
-
- p_playlist->pp_items[i_pos]->b_enabled = VLC_TRUE;
+ playlist_Delete( p_playlist, p_playlist->pp_items[0]->input.i_id );
}
-
- vlc_mutex_unlock( &p_playlist->object_lock );
-
- val.b_bool = i_pos;
- var_Set( p_playlist, "item-change", val );
-
- return 0;
+ return VLC_SUCCESS;
}
+
/**
- * Disables a playlist group
+ * Disables a playlist item
*
* \param p_playlist the playlist to disable from.
- * \param i_pos the id of the group to disable
+ * \param i_pos the position of the item to disable
* \return returns 0
*/
-int playlist_DisableGroup( playlist_t * p_playlist, int i_group)
+int playlist_Disable( playlist_t * p_playlist, playlist_item_t *p_item )
{
- vlc_value_t val;
- int i;
- vlc_mutex_lock( &p_playlist->object_lock );
+ if( !p_item ) return VLC_EGENERIC;
- msg_Dbg(p_playlist,"Disabling group %i",i_group);
- for( i = 0 ; i< p_playlist->i_size; i++ )
- {
- if( p_playlist->pp_items[i]->i_group == i_group )
- {
- msg_Dbg( p_playlist, "disabling playlist item « %s »",
- p_playlist->pp_items[i]->psz_name );
-
- if( p_playlist->pp_items[i]->b_enabled == VLC_TRUE )
- p_playlist->i_enabled--;
+ msg_Dbg( p_playlist, "disabling playlist item `%s'",
+ p_item->input.psz_name );
- p_playlist->pp_items[i]->b_enabled = VLC_FALSE;
- val.b_bool = i;
- var_Set( p_playlist, "item-change", val );
- }
+ if( p_item->i_flags & PLAYLIST_ENA_FLAG )
+ {
+ p_playlist->i_enabled--;
}
- vlc_mutex_unlock( &p_playlist->object_lock );
+ p_item->i_flags &= ~PLAYLIST_ENA_FLAG;
- return 0;
+ var_SetInteger( p_playlist, "item-change", p_item->input.i_id );
+ return VLC_SUCCESS;
}
/**
- * Enables a playlist group
+ * Enables a playlist item
*
* \param p_playlist the playlist to enable from.
- * \param i_pos the id of the group to enable
+ * \param i_pos the position of the item to enable
* \return returns 0
*/
-int playlist_EnableGroup( playlist_t * p_playlist, int i_group)
+int playlist_Enable( playlist_t * p_playlist, playlist_item_t *p_item )
{
- vlc_value_t val;
- int i;
- vlc_mutex_lock( &p_playlist->object_lock );
-
- for( i = 0 ; i< p_playlist->i_size; i++ )
- {
- if( p_playlist->pp_items[i]->i_group == i_group )
- {
- msg_Dbg( p_playlist, "enabling playlist item « %s »",
- p_playlist->pp_items[i]->psz_name );
+ if( !p_item ) return VLC_EGENERIC;
- if( p_playlist->pp_items[i]->b_enabled == VLC_FALSE )
- p_playlist->i_enabled++;
+ msg_Dbg( p_playlist, "enabling playlist item `%s'",
+ p_item->input.psz_name );
- p_playlist->pp_items[i]->b_enabled = VLC_TRUE;
- val.b_bool = i;
- var_Set( p_playlist, "item-change", val );
- }
+ if( p_item->i_flags & ~PLAYLIST_ENA_FLAG )
+ {
+ p_playlist->i_enabled++;
}
- vlc_mutex_unlock( &p_playlist->object_lock );
+ p_item->i_flags |= PLAYLIST_ENA_FLAG;
- return 0;
+ var_SetInteger( p_playlist, "item-change", p_item->input.i_id );
+ return VLC_SUCCESS;
}
/**
* \param i_pos the position of the item to move
* \param i_newpos the position of the item that will be behind the moved item
* after the move
- * \return returns 0
+ * \return returns VLC_SUCCESS
*/
-int playlist_Move( playlist_t * p_playlist, int i_pos, int i_newpos)
+int playlist_Move( playlist_t * p_playlist, int i_pos, int i_newpos )
{
- vlc_value_t val;
+ vlc_value_t val;
vlc_mutex_lock( &p_playlist->object_lock );
/* take into account that our own row disappears. */
- if ( i_pos < i_newpos ) i_newpos--;
+ if( i_pos < i_newpos ) i_newpos--;
- if( i_pos >= 0 && i_newpos >=0 && i_pos <= p_playlist->i_size
- && i_newpos <= p_playlist->i_size )
+ if( i_pos >= 0 && i_newpos >=0 && i_pos <= p_playlist->i_size &&
+ i_newpos <= p_playlist->i_size )
{
playlist_item_t * temp;
- msg_Dbg( p_playlist, "moving playlist item « %s » (%i -> %i)",
- p_playlist->pp_items[i_pos]->psz_name, i_pos,
- i_newpos );
+ msg_Dbg( p_playlist, "moving playlist item `%s' (%i -> %i)",
+ p_playlist->pp_items[i_pos]->input.psz_name, i_pos, i_newpos);
if( i_pos == p_playlist->i_index )
{
p_playlist->i_index = i_newpos;
}
- else if( i_pos > p_playlist->i_index && i_newpos <= p_playlist->i_index )
+ else if( i_pos > p_playlist->i_index &&
+ i_newpos <= p_playlist->i_index )
{
p_playlist->i_index++;
}
- else if( i_pos < p_playlist->i_index && i_newpos >= p_playlist->i_index )
+ else if( i_pos < p_playlist->i_index &&
+ i_newpos >= p_playlist->i_index )
{
p_playlist->i_index--;
}
val.b_bool = VLC_TRUE;
var_Set( p_playlist, "intf-change", val );
- return 0;
+ return VLC_SUCCESS;
}
projects / vlc / blobdiff