X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fsearch.c;h=7c731fc449a5abceb397237345c6a510e55ce2ec;hb=6b843acc086616c8df89f2805029fd81f75c4cac;hp=3dfd1a4911520ed594e8b189db9b62678cd71472;hpb=1a48e3111a0ae730e7eee4592d8bb9cfe73b8d2e;p=vlc

diff --git a/src/playlist/search.c b/src/playlist/search.c
index 3dfd1a4911..7c731fc449 100644
--- a/src/playlist/search.c
+++ b/src/playlist/search.c
@@ -25,7 +25,7 @@
 #endif
 #include <assert.h>
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "vlc_playlist.h"
 #include "playlist_internal.h"
 
@@ -41,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;
 }
 
@@ -63,35 +64,47 @@ 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++ )
     {
@@ -113,15 +126,14 @@ playlist_item_t * playlist_ItemGetByInputId( playlist_t *p_playlist,
  * Live search handling
  ***************************************************************************/
 
-static vlc_bool_t playlist_LiveSearchUpdateInternal( playlist_t *p_playlist,
+static bool playlist_LiveSearchUpdateInternal( playlist_t *p_playlist,
                                                      playlist_item_t *p_root,
                                                      const char *psz_string )
 {
    int i;
-   vlc_bool_t b_match = VLC_FALSE;
+   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 )
         {
@@ -129,7 +141,7 @@ static vlc_bool_t playlist_LiveSearchUpdateInternal( playlist_t *p_playlist,
                 strcasestr( p_item->p_input->psz_name, psz_string ) )
             {
                 p_item->i_flags &= ~PLAYLIST_DBL_FLAG;
-                b_match = VLC_TRUE;
+                b_match = true;
             }
             else
             {
@@ -143,7 +155,7 @@ static vlc_bool_t playlist_LiveSearchUpdateInternal( playlist_t *p_playlist,
                 input_item_MetaMatch( p_item->p_input, vlc_meta_Artist, psz_string ) )
             {
                 p_item->i_flags &= ~PLAYLIST_DBL_FLAG;
-                b_match = VLC_TRUE;
+                b_match = true;
             }
             else
             {
@@ -157,8 +169,9 @@ static vlc_bool_t playlist_LiveSearchUpdateInternal( playlist_t *p_playlist,
 int playlist_LiveSearchUpdate( playlist_t *p_playlist, playlist_item_t *p_root,
                                const char *psz_string )
 {
-   p_playlist->b_reset_currently_playing = VLC_TRUE;
+    PL_ASSERT_LOCKED;
+    pl_priv(p_playlist)->b_reset_currently_playing = true;
     playlist_LiveSearchUpdateInternal( p_playlist, p_root, psz_string );
-    vlc_cond_signal( &p_playlist->object_wait );
+    vlc_object_signal_unlocked( p_playlist );
     return VLC_SUCCESS;
 }