i_mode |= PLAYLIST_APPEND;
}
- msg_Dbg( p_playlist, "adding playlist item `%s' ( %s )",
+ msg_Info( 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;
}
INSERT_ELEM( p_playlist->pp_items, p_playlist->i_size, i_pos, p_item );
+ INSERT_ELEM( p_playlist->pp_all_items, p_playlist->i_all_size,
+ p_playlist->i_all_size, p_item );
p_playlist->i_enabled ++;
/* We update the ALL view directly */
{
playlist_NodeAppend( p_playlist, VIEW_CATEGORY, p_item,
p_playlist->p_general );
- p_add->p_item = p_item;
- p_add->p_node = p_playlist->p_general;
+ p_add->i_item = p_item->input.i_id;
+ p_add->i_node = p_playlist->p_general->input.i_id;
p_add->i_view = VIEW_CATEGORY;
val.p_address = p_add;
var_Set( p_playlist, "item-append", val );
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 );
- p_add->p_item = p_item;
- p_add->p_node = p_view->p_root;
- p_add->i_view = VIEW_SIMPLE;
- val.p_address = p_add;
- var_Set( p_playlist, "item-append", val );
- }
- 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->request.b_request = VLC_TRUE;
/* FIXME ... */
- p_playlist->request.i_view = VIEW_SIMPLE;
+ p_playlist->request.i_view = VIEW_CATEGORY;
p_playlist->request.p_node = p_view->p_root;
p_playlist->request.p_item = p_item;
i_mode |= PLAYLIST_APPEND;
}
- msg_Dbg( p_playlist, "adding playlist item `%s' ( %s )",
+ msg_Info( 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;
p_playlist->i_size,
i_position,
p_item );
+ INSERT_ELEM( p_playlist->pp_all_items,
+ p_playlist->i_all_size,
+ p_playlist->i_all_size,
+ p_item );
p_playlist->i_enabled ++;
/* TODO: Handle modes */
playlist_NodeAppend( p_playlist, i_view, p_item, p_parent );
- p_add->p_item = p_item;
- p_add->p_node = p_parent;
+ p_add->i_item = p_item->input.i_id;
+ p_add->i_node = p_parent->input.i_id;
p_add->i_view = i_view;
val.p_address = p_add;
var_Set( p_playlist, "item-append", val );
int playlist_GetPositionById( playlist_t * p_playlist , int i_id )
{
int i;
- for( i = 0 ; i < p_playlist->i_size ; i++ )
+ for( i = 0 ; i < p_playlist->i_all_size ; i++ )
{
- if( p_playlist->pp_items[i]->input.i_id == i_id )
+ if( p_playlist->pp_all_items[i]->input.i_id == i_id )
{
return i;
}
}
}
+playlist_item_t *playlist_LockItemGetByPos( playlist_t *p_playlist, int i_pos )
+{
+ playlist_item_t *p_ret;
+ vlc_mutex_lock( &p_playlist->object_lock );
+ p_ret = playlist_ItemGetByPos( p_playlist, i_pos );
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ return p_ret;
+}
+
/**
* Search an item by its id
*
*/
playlist_item_t * playlist_ItemGetById( playlist_t * p_playlist , int i_id )
{
- int i;
- for( i = 0 ; i < p_playlist->i_size ; i++ )
+ int i, i_top, i_bottom;
+ i_bottom = 0; i_top = p_playlist->i_all_size;
+ i = i_top / 2;
+ while( p_playlist->pp_all_items[i]->input.i_id != i_id &&
+ i_top > i_bottom )
{
- if( p_playlist->pp_items[i]->input.i_id == i_id )
+ if( p_playlist->pp_all_items[i]->input.i_id < i_id )
{
- return p_playlist->pp_items[i];
+ i_bottom = i + 1;
+ }
+ else
+ {
+ i_top = i - 1;
}
+ i = i_bottom + ( i_top - i_bottom ) / 2;
+ }
+ if( p_playlist->pp_all_items[i]->input.i_id == i_id )
+ {
+ return p_playlist->pp_all_items[i];
}
return NULL;
}
+playlist_item_t *playlist_LockItemGetById( playlist_t *p_playlist, int i_id)
+{
+ playlist_item_t *p_ret;
+ vlc_mutex_lock( &p_playlist->object_lock );
+ p_ret = playlist_ItemGetById( p_playlist, i_id );
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ return p_ret;
+}
+
/**
* Search an item by its input_item_t
*
return NULL;
}
+playlist_item_t *playlist_LockItemGetByInput( playlist_t *p_playlist,
+ input_item_t *p_item )
+{
+ playlist_item_t *p_ret;
+ vlc_mutex_lock( &p_playlist->object_lock );
+ p_ret = playlist_ItemGetByInput( p_playlist, p_item );
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ return p_ret;
+}
/***********************************************************************
p_item->i_children = 0;
}
- vlc_mutex_lock( &p_playlist->object_lock );
-
/* Remove it from the array of available items */
for( i = 0 ; i < p_playlist->i_size ; i++ )
{
REMOVE_ELEM( p_playlist->pp_items, p_playlist->i_size, i );
}
}
- vlc_mutex_unlock( &p_playlist->object_lock );
var_SetInteger( p_playlist, "item-change", p_item->input.i_id );
return VLC_SUCCESS;
}
+int playlist_LockItemToNode( playlist_t *p_playlist, playlist_item_t *p_item )
+{
+ int i_ret;
+ vlc_mutex_lock( &p_playlist->object_lock );
+ i_ret = playlist_ItemToNode( p_playlist, p_item );
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ return i_ret;
+}
+
/**
* Replaces an item with another one
* This function must be entered without the playlist lock
*
* \see playlist_Replace
*/
-int playlist_LockAndReplace( playlist_t *p_playlist,
+int playlist_LockReplace( playlist_t *p_playlist,
playlist_item_t *p_olditem,
input_item_t *p_new )
{
*/
int playlist_Delete( playlist_t * p_playlist, int i_id )
{
- vlc_value_t val;
- int i;
+ int i, i_top, i_bottom;
+ vlc_bool_t b_flag = VLC_FALSE;
playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id );
}
var_SetInteger( p_playlist, "item-deleted", i_id );
+ i_bottom = 0; i_top = p_playlist->i_all_size;
+ i = i_top / 2;
+ while( p_playlist->pp_all_items[i]->input.i_id != i_id &&
+ i_top > i_bottom )
+ {
+ if( p_playlist->pp_all_items[i]->input.i_id < i_id )
+ {
+ i_bottom = i + 1;
+ }
+ else
+ {
+ i_top = i - 1;
+ }
+ i = i_bottom + ( i_top - i_bottom ) / 2;
+ }
+ if( p_playlist->pp_all_items[i]->input.i_id == i_id )
+ {
+ REMOVE_ELEM( p_playlist->pp_all_items, p_playlist->i_all_size, i );
+ }
+
/* Check if it is the current item */
if( p_playlist->status.p_item == p_item )
{
- playlist_Control( p_playlist, PLAYLIST_STOP );
- p_playlist->status.p_item = NULL;
+ /* Hack we don't call playlist_Control for lock reasons */
+ p_playlist->status.i_status = PLAYLIST_STOPPED;
+ p_playlist->request.b_request = VLC_TRUE;
+// p_playlist->status.p_item = NULL;
+ msg_Info( p_playlist, "stopping playback" );
+ b_flag = VLC_TRUE;
}
- vlc_mutex_lock( &p_playlist->object_lock );
-
- msg_Dbg( p_playlist, "deleting playlist item `%s'",
+ msg_Info( p_playlist, "deleting playlist item `%s'",
p_item->input.psz_name );
/* Remove the item from all its parent nodes */
/* TODO : Update views */
- playlist_ItemDelete( p_item );
-
- vlc_mutex_unlock( &p_playlist->object_lock );
+ if( b_flag == VLC_FALSE )
+ playlist_ItemDelete( p_item );
+ else
+ p_item->i_flags |= PLAYLIST_REMOVE_FLAG;
return VLC_SUCCESS;
}
+int playlist_LockDelete( playlist_t * p_playlist, int i_id )
+{
+ int i_ret;
+ vlc_mutex_lock( &p_playlist->object_lock );
+ i_ret = playlist_Delete( p_playlist, i_id );
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ return i_ret;
+}
+
/**
* Clear all playlist items
*
int playlist_Clear( playlist_t * p_playlist )
{
int i;
- playlist_view_t *p_view;
for( i = p_playlist->i_size; i > 0 ; i-- )
{
playlist_Delete( p_playlist, p_playlist->pp_items[0]->input.i_id );
return VLC_SUCCESS;
}
+int playlist_LockClear( playlist_t *p_playlist )
+{
+ int i_ret;
+ vlc_mutex_lock( &p_playlist->object_lock );
+ i_ret = playlist_Clear( p_playlist );
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ return i_ret;
+}
+
/**
* Disables a playlist item
projects / vlc / blobdiff