From b33f655357605832dfc3d392691ab8be75acf0b8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Cl=C3=A9ment=20Stenac?= Date: Thu, 25 May 2006 09:04:19 +0000 Subject: [PATCH] * Search on artist and album * Remove some debug --- src/playlist/item.c | 2 -- src/playlist/search.c | 6 +++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/playlist/item.c b/src/playlist/item.c index 019dc88aec..1285fe074c 100644 --- a/src/playlist/item.c +++ b/src/playlist/item.c @@ -357,13 +357,11 @@ int playlist_BothAddInput( playlist_t *p_playlist, /* Add to category */ p_item = playlist_ItemNewFromInput( p_playlist, p_input ); if( p_item == NULL ) return VLC_EGENERIC; - fprintf( stderr, "Adding to CATEGORY\n"); AddItem( p_playlist, p_item, p_direct_parent, i_pos ); /* Add to onelevel */ p_item = playlist_ItemNewFromInput( p_playlist, p_input ); if( p_item == NULL ) return VLC_EGENERIC; - fprintf( stderr, "Adding to ONE\n"); p_up = p_direct_parent; while( p_up->p_parent != p_playlist->p_root_category ) diff --git a/src/playlist/search.c b/src/playlist/search.c index 29c0779620..10a8b706a3 100644 --- a/src/playlist/search.c +++ b/src/playlist/search.c @@ -99,8 +99,12 @@ int playlist_LiveSearchUpdate( playlist_t *p_playlist, playlist_item_t *p_root, { playlist_LiveSearchUpdate( p_playlist, p_item, psz_string ); } +#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 ) ) /* Todo: Filter on all fields */ - if( strcasestr( p_item->p_input->psz_name, 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; -- 2.39.2