X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fsearch.c;h=773496e033ab3cc2e913451a85fd717177d4db66;hb=350b1052769f273c46b29d1ba60e2caa9c925ecb;hp=c831566e3327ba24080e5c511e23fcc843da1d4f;hpb=ce186430e261d636d232c0fedef3f58719351f17;p=vlc diff --git a/src/playlist/search.c b/src/playlist/search.c index c831566e33..773496e033 100644 --- a/src/playlist/search.c +++ b/src/playlist/search.c @@ -1,7 +1,7 @@ /***************************************************************************** * search.c : Search functions ***************************************************************************** - * Copyright (C) 1999-2004 the VideoLAN team + * Copyright (C) 1999-2009 the VideoLAN team * $Id$ * * Authors: Clément Stenac @@ -20,7 +20,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif +#include + +#include #include "vlc_playlist.h" #include "playlist_internal.h" @@ -29,109 +34,144 @@ ***************************************************************************/ /** - * 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, - vlc_bool_t b_locked ) +playlist_item_t* playlist_ItemGetById( playlist_t * p_playlist , int i_id ) { int i; - if( !b_locked ) PL_LOCK; + PL_ASSERT_LOCKED; ARRAY_BSEARCH( p_playlist->all_items,->i_id, int, i_id, i ); - if( i != -1 ) { - if( !b_locked ) PL_UNLOCK; + if( i != -1 ) return ARRAY_VAL( p_playlist->all_items, i ); - } - if( !b_locked ) PL_UNLOCK; - 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, - vlc_bool_t b_locked ) +playlist_item_t* playlist_ItemGetByInput( playlist_t * p_playlist, + input_item_t *p_item ) { int i; - if( !b_locked ) PL_LOCK; - if( p_playlist->status.p_item && - p_playlist->status.p_item->p_input == p_item ) + PL_ASSERT_LOCKED; + if( get_current_status_item( p_playlist ) && + get_current_status_item( p_playlist )->p_input == p_item ) { - if( !b_locked ) PL_UNLOCK; - return p_playlist->status.p_item; + 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 ) { - if( !b_locked ) PL_UNLOCK; return ARRAY_VAL(p_playlist->all_items, i); } } - if( !b_locked ) PL_UNLOCK; return NULL; } -/** Find the playlist item matching the input id under the given node */ -playlist_item_t * playlist_ItemGetByInputId( playlist_t *p_playlist, - int i_input_id, - playlist_item_t *p_root ) + +/*************************************************************************** + * Live search handling + ***************************************************************************/ + +/** + * Enable all items in the playlist + * @param p_root: the current root item + */ +static void playlist_LiveSearchClean( playlist_item_t *p_root ) { - int i; - assert( p_root != NULL ); - for( i = 0 ; i< p_root->i_children ; i++ ) + for( int i = 0; i < p_root->i_children; i++ ) { - if( p_root->pp_children[i]->i_children == -1 && - 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] ); - } + playlist_item_t *p_item = p_root->pp_children[i]; + if( p_item->i_children >= 0 ) + playlist_LiveSearchClean( p_item ); + p_item->i_flags &= ~PLAYLIST_DBL_FLAG; } - return NULL; } -/*************************************************************************** - * Live search handling - ***************************************************************************/ -int playlist_LiveSearchUpdate( playlist_t *p_playlist, playlist_item_t *p_root, - const char *psz_string ) +/** + * Enable/Disable items in the playlist according to the search argument + * @param p_root: the current root item + * @param psz_string: the string to search + * @return true if an item match + */ +static bool playlist_LiveSearchUpdateInternal( playlist_item_t *p_root, + const char *psz_string, bool b_recursive ) { - int i; - p_playlist->b_reset_currently_playing = VLC_TRUE; - for( i = 0 ; i< p_root->i_children ; i ++ ) - { + int i; + bool b_match = false; + for( i = 0 ; i < p_root->i_children ; i ++ ) + { + bool b_enable = false; playlist_item_t *p_item = p_root->pp_children[i]; - if( p_item->i_children > -1 ) + // Go recurssively if their is some children + if( b_recursive && p_item->i_children >= 0 && + playlist_LiveSearchUpdateInternal( p_item, psz_string, true ) ) { - playlist_LiveSearchUpdate( p_playlist, p_item, psz_string ); + b_enable = true; } -#define META_MATCHES( field ) ( p_item->p_input->p_meta && \ - p_item->p_input->p_meta->psz_##field && \ - strcasestr( p_item->p_input->p_meta->psz_##field, psz_string ) ) - else + + if( !b_enable ) { - if( strcasestr( p_item->p_input->psz_name, psz_string ) || - META_MATCHES( artist ) || META_MATCHES( album ) ) - p_item->i_flags &= ~PLAYLIST_DBL_FLAG; + vlc_mutex_lock( &p_item->p_input->lock ); + // Do we have some meta ? + if( p_item->p_input->p_meta ) + { + // Use Title or fall back to psz_name + const char *psz_title = vlc_meta_Get( p_item->p_input->p_meta, vlc_meta_Title ); + if( !psz_title ) + psz_title = p_item->p_input->psz_name; + const char *psz_album = vlc_meta_Get( p_item->p_input->p_meta, vlc_meta_Album ); + const char *psz_artist = vlc_meta_Get( p_item->p_input->p_meta, vlc_meta_Artist ); + b_enable = ( psz_title && strcasestr( psz_title, psz_string ) ) || + ( psz_album && strcasestr( psz_album, psz_string ) ) || + ( psz_artist && strcasestr( psz_artist, psz_string ) ); + } else - p_item->i_flags |= PLAYLIST_DBL_FLAG; + b_enable = p_item->p_input->psz_name && strcasestr( p_item->p_input->psz_name, psz_string ); + vlc_mutex_unlock( &p_item->p_input->lock ); } + + if( b_enable ) + p_item->i_flags &= ~PLAYLIST_DBL_FLAG; + else + p_item->i_flags |= PLAYLIST_DBL_FLAG; + + b_match |= b_enable; } - vlc_cond_signal( &p_playlist->object_wait ); - return VLC_SUCCESS; + return b_match; +} + + + +/** + * Launch the recursive search in the playlist + * @param p_playlist: the playlist + * @param p_root: the current root item + * @param psz_string: the string to find + * @return VLC_SUCCESS + */ +int playlist_LiveSearchUpdate( playlist_t *p_playlist, playlist_item_t *p_root, + 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, b_recursive ); + else + playlist_LiveSearchClean( p_root ); + vlc_cond_signal( &pl_priv(p_playlist)->signal ); + return VLC_SUCCESS; } +