X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fplaylist%2Fsearch.c;h=b3f82233a109d313afe96b5cc90556883f4a3e80;hb=32b31e87d90967549e5cc8bef18d5aae7e3b98c6;hp=15c29f603965255e48959aefbbd17f054bfcc7f5;hpb=38dbd37adf32cf04e1caf17ceb7888a4a5ec2f40;p=vlc diff --git a/src/playlist/search.c b/src/playlist/search.c index 15c29f6039..b3f82233a1 100644 --- a/src/playlist/search.c +++ b/src/playlist/search.c @@ -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" @@ -36,16 +41,17 @@ * \return the item or NULL on failure */ playlist_item_t * playlist_ItemGetById( playlist_t * p_playlist , int i_id, - vlc_bool_t b_locked ) + bool b_locked ) { int i; - if( !b_locked ) PL_LOCK; + PL_LOCK_IF( !b_locked ); ARRAY_BSEARCH( p_playlist->all_items,->i_id, int, i_id, i ); - if( i != -1 ) { - if( !b_locked ) PL_UNLOCK; + if( i != -1 ) + { + PL_UNLOCK_IF( !b_locked ); return ARRAY_VAL( p_playlist->all_items, i ); } - if( !b_locked ) PL_UNLOCK; + PL_UNLOCK_IF( !b_locked ); return NULL; } @@ -58,39 +64,51 @@ playlist_item_t * playlist_ItemGetById( playlist_t * p_playlist , int i_id, */ playlist_item_t * playlist_ItemGetByInput( playlist_t * p_playlist , input_item_t *p_item, - vlc_bool_t b_locked ) + bool b_locked ) { int i; - if( !b_locked ) PL_LOCK; - 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 ) { - if( !b_locked ) PL_UNLOCK; - 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 ) { - if( !b_locked ) PL_UNLOCK; + PL_UNLOCK_IF( !b_locked ); return ARRAY_VAL(p_playlist->all_items, i); } } - if( !b_locked ) PL_UNLOCK; + PL_UNLOCK_IF( !b_locked ); return NULL; } -/** Find the playlist item matching the input id under the given node */ +/** + * 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]->i_children == -1 && + 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]; @@ -108,46 +126,52 @@ playlist_item_t * playlist_ItemGetByInputId( 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_currently_playing = 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; + } } else { - char *psz_name_matches, *psz_artist_matches, *psz_album_matches; - char *psz_field, *psz_field_case; - - psz_field = input_item_GetName( p_i ); - psz_name_matches = strcasestr( psz_field, psz_string ); - free( psz_field ); - - psz_field = input_item_GetMeta( p_item->p_input, vlc_meta_Artist ); - psz_field_case = strcasestr( input_item_GetMeta( p_item->p_input, vlc_meta_Artist ), psz_string ); - psz_artist_matches = ( psz_field && psz_field_case ); - free( psz_field ); - free( psz_field_case ); - - - psz_field = input_item_GetMeta( p_item->p_input, vlc_meta_Album ); - psz_field_case = strcasestr( input_item_GetMeta( p_item->p_input, vlc_meta_Album ), psz_string ); - psz_album_matches = ( psz_field && psz_field_case ); - free( psz_field ); - free( psz_field_case ); - - if( psz_name_matches || psz_artist_matches || psz_album_matches ) + 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; + } } } - vlc_cond_signal( &p_playlist->object_wait ); - 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; }