- 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 ) )
+ {