* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <vlc/vlc.h>
-#include <vlc/input.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <assert.h>
+#include <vlc_common.h>
#include "vlc_playlist.h"
+#include "playlist_internal.h"
/***************************************************************************
* Item search functions
* \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;
+ if( !b_locked ) PL_LOCK;
+ ARRAY_BSEARCH( p_playlist->all_items,->i_id, int, i_id, i );
+ if( i != -1 )
{
- return p_playlist->pp_all_items[i];
+ if( !b_locked ) PL_UNLOCK;
+ return ARRAY_VAL( p_playlist->all_items, i );
}
+ if( !b_locked ) PL_UNLOCK;
return NULL;
}
* \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 )
+ if( !b_locked ) PL_LOCK;
+ if( p_playlist->status.p_item &&
+ p_playlist->status.p_item->p_input == p_item )
{
+ if( !b_locked ) PL_UNLOCK;
return p_playlist->status.p_item;
}
+ /** \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;
+ return ARRAY_VAL(p_playlist->all_items, i);
+ }
+ }
+ if( !b_locked ) PL_UNLOCK;
+ 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;
+ assert( p_root != NULL );
+ for( i = 0 ; i< p_root->i_children ; i++ )
{
-msg_Err( p_playlist, "%p, %p", p_item, p_playlist->pp_all_items[i]->p_input );
- if( p_playlist->pp_all_items[i]->p_input == p_item )
+ 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;
* 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;
- 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;
+ }
}
- /* Todo: Filter on all fields */
- if( strcasestr( p_item->p_input->psz_name, psz_string ) )
- 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 )
+{
+ p_playlist->b_reset_currently_playing = true;
+ playlist_LiveSearchUpdateInternal( p_playlist, p_root, psz_string );
+ vlc_cond_signal( &p_playlist->object_wait );
+ return VLC_SUCCESS;
}
projects / vlc / blobdiff