X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fsearch.c;h=b3f82233a109d313afe96b5cc90556883f4a3e80;hb=fa81ade13492bab2a809e6c8990e211f04aecab8;hp=e1a35211b4c171a375263a52f8e656b5db94e9a4;hpb=25ff9ffdcabfb151e25f320dbafde1e8b94b5a6f;p=vlc diff --git a/src/playlist/search.c b/src/playlist/search.c index e1a35211b4..b3f82233a1 100644 --- a/src/playlist/search.c +++ b/src/playlist/search.c @@ -20,10 +20,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif +#include +#include #include "vlc_playlist.h" +#include "playlist_internal.h" /*************************************************************************** * Item search functions @@ -36,24 +40,18 @@ * \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 ) +playlist_item_t * playlist_ItemGetById( playlist_t * p_playlist , int i_id, + bool b_locked ) { - int i, i_top, i_bottom; - i_bottom = 0; i_top = p_playlist->i_all_size - 1; - i = i_top / 2; - while( p_playlist->pp_all_items[i]->i_id != i_id && - i_top > i_bottom ) - { - if( p_playlist->pp_all_items[i]->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]->i_id == i_id ) + int i; + PL_LOCK_IF( !b_locked ); + ARRAY_BSEARCH( p_playlist->all_items,->i_id, int, i_id, i ); + if( i != -1 ) { - return p_playlist->pp_all_items[i]; + PL_UNLOCK_IF( !b_locked ); + return ARRAY_VAL( p_playlist->all_items, i ); } + PL_UNLOCK_IF( !b_locked ); return NULL; } @@ -65,20 +63,60 @@ playlist_item_t * playlist_ItemGetById( playlist_t * p_playlist , int i_id ) * \return the item, or NULL on failure */ playlist_item_t * playlist_ItemGetByInput( playlist_t * p_playlist , - input_item_t *p_item ) + input_item_t *p_item, + bool b_locked ) { int i; - if( p_playlist->status.p_item && - p_playlist->status.p_item->p_input == p_item ) + PL_LOCK_IF( !b_locked ); + if( get_current_status_item( p_playlist ) && + get_current_status_item( p_playlist )->p_input == p_item ) { - return p_playlist->status.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; + } + /** \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 ) + { + PL_UNLOCK_IF( !b_locked ); + return ARRAY_VAL(p_playlist->all_items, i); + } } + PL_UNLOCK_IF( !b_locked ); + return NULL; +} - for( i = 0 ; i < p_playlist->i_all_size; i++ ) +/** + * 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_playlist->pp_all_items[i]->p_input->i_id == p_item->i_id ) + 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 p_playlist->pp_all_items[i]; + return playlist_ItemGetByInputId( p_playlist, i_input_id, + p_root->pp_children[i] ); } } return NULL; @@ -88,26 +126,52 @@ playlist_item_t * playlist_ItemGetByInput( playlist_t * p_playlist , * Live search handling ***************************************************************************/ -int playlist_LiveSearchUpdate( playlist_t *p_playlist, playlist_item_t *p_root, - const char *psz_string ) +static bool playlist_LiveSearchUpdateInternal( playlist_t *p_playlist, + playlist_item_t *p_root, + const char *psz_string ) { int i; - p_playlist->b_reset_random = VLC_TRUE; - for( i = 0 ; i< p_root->i_children ; i ++ ) + bool b_match = false; + for( i = 0 ; i < p_root->i_children ; i ++ ) { playlist_item_t *p_item = p_root->pp_children[i]; if( p_item->i_children > -1 ) { - playlist_LiveSearchUpdate( p_playlist, p_item, psz_string ); + if( playlist_LiveSearchUpdateInternal( p_playlist, p_item, psz_string ) || + strcasestr( p_item->p_input->psz_name, psz_string ) ) + { + p_item->i_flags &= ~PLAYLIST_DBL_FLAG; + b_match = true; + } + else + { + p_item->i_flags |= PLAYLIST_DBL_FLAG; + } } -#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 ) ) - if( strcasestr( p_item->p_input->psz_name, psz_string ) || - META_MATCHES( artist ) || META_MATCHES( album ) ) - p_item->i_flags &= ~PLAYLIST_DBL_FLAG; else - p_item->i_flags |= PLAYLIST_DBL_FLAG; + { + if( strcasestr( p_item->p_input->psz_name, psz_string ) || /* Soon to be replaced by vlc_meta_Title */ + input_item_MetaMatch( p_item->p_input, vlc_meta_Album, psz_string ) || + input_item_MetaMatch( p_item->p_input, vlc_meta_Artist, psz_string ) ) + { + p_item->i_flags &= ~PLAYLIST_DBL_FLAG; + b_match = true; + } + else + { + p_item->i_flags |= PLAYLIST_DBL_FLAG; + } + } } - return VLC_SUCCESS; + return b_match; +} + +int playlist_LiveSearchUpdate( playlist_t *p_playlist, playlist_item_t *p_root, + const char *psz_string ) +{ + PL_ASSERT_LOCKED; + p_playlist->b_reset_currently_playing = true; + playlist_LiveSearchUpdateInternal( p_playlist, p_root, psz_string ); + vlc_object_signal_maybe( VLC_OBJECT(p_playlist) ); + return VLC_SUCCESS; }