***************************************************************************/
/**
- * Search a playlist item by its playlist_item id
- *
- * \param p_playlist the playlist
- * \param i_id the id to find
- * \return the item or NULL on failure
+ * Search a playlist item by its playlist_item id.
+ * The playlist have to be locked
+ * @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,
- bool b_locked )
+playlist_item_t* playlist_ItemGetById( playlist_t * p_playlist , int i_id )
{
int i;
- PL_LOCK_IF( !b_locked );
+ PL_ASSERT_LOCKED;
ARRAY_BSEARCH( p_playlist->all_items,->i_id, int, i_id, i );
if( i != -1 )
- {
- PL_UNLOCK_IF( !b_locked );
return ARRAY_VAL( p_playlist->all_items, i );
- }
- PL_UNLOCK_IF( !b_locked );
- return NULL;
+ 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
+ * The playlist have to be locked
+ * @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,
- bool b_locked )
+playlist_item_t* playlist_ItemGetByInput( playlist_t * p_playlist,
+ input_item_t *p_item )
{
int i;
- PL_LOCK_IF( !b_locked );
+ PL_ASSERT_LOCKED;
if( get_current_status_item( p_playlist ) &&
get_current_status_item( p_playlist )->p_input == p_item )
{
- /* FIXME: this is potentially dangerous, we could destroy
- * p_ret any time soon */
- playlist_item_t *p_ret = get_current_status_item( p_playlist );
- PL_UNLOCK_IF( !b_locked );
- return p_ret;
+ return get_current_status_item( p_playlist );
}
/** \todo Check if this is always incremental and whether we can bsearch */
for( i = 0 ; i < p_playlist->all_items.i_size; i++ )
{
- if( ARRAY_VAL(p_playlist->all_items, i)->p_input->i_id == p_item->i_id )
+ if( ARRAY_VAL(p_playlist->all_items, i)->p_input == p_item )
{
- PL_UNLOCK_IF( !b_locked );
return ARRAY_VAL(p_playlist->all_items, i);
}
}
- PL_UNLOCK_IF( !b_locked );
return NULL;
}
-/**
- * Get input by item id
- *
- * Find the playlist item matching the input id under the given node
- * \param p_playlist the playlist
- * \param i_input_id the id of the input to find
- * \param p_root the root node of the search
- * \return the playlist item or NULL on failure
- */
-playlist_item_t * playlist_ItemGetByInputId( playlist_t *p_playlist,
- int i_input_id,
- playlist_item_t *p_root )
-{
- int i;
- PL_ASSERT_LOCKED;
- assert( p_root != NULL );
- for( i = 0 ; i< p_root->i_children ; i++ )
- {
- if( p_root->pp_children[i]->p_input &&
- p_root->pp_children[i]->p_input->i_id == i_input_id )
- {
- return p_root->pp_children[i];
- }
- else if( p_root->pp_children[i]->i_children >= 0 )
- {
- return playlist_ItemGetByInputId( p_playlist, i_input_id,
- p_root->pp_children[i] );
- }
- }
- return NULL;
-}
-
/***************************************************************************
* Live search handling
***************************************************************************/
* @return true if an item match
*/
static bool playlist_LiveSearchUpdateInternal( playlist_item_t *p_root,
- const char *psz_string )
+ const char *psz_string, bool b_recursive )
{
int i;
bool b_match = false;
bool b_enable = false;
playlist_item_t *p_item = p_root->pp_children[i];
// Go recurssively if their is some children
- if( p_item->i_children >= 0 &&
- playlist_LiveSearchUpdateInternal( p_item, psz_string ) )
+ if( b_recursive && p_item->i_children >= 0 &&
+ playlist_LiveSearchUpdateInternal( p_item, psz_string, true ) )
{
b_enable = true;
}
* @return VLC_SUCCESS
*/
int playlist_LiveSearchUpdate( playlist_t *p_playlist, playlist_item_t *p_root,
- const char *psz_string )
+ const char *psz_string, bool b_recursive )
{
PL_ASSERT_LOCKED;
pl_priv(p_playlist)->b_reset_currently_playing = true;
if( *psz_string )
- playlist_LiveSearchUpdateInternal( p_root, psz_string );
+ playlist_LiveSearchUpdateInternal( p_root, psz_string, b_recursive );
else
playlist_LiveSearchClean( p_root );
vlc_cond_signal( &pl_priv(p_playlist)->signal );