Compare input item pointers, no need to deref here

diff --git a/modules/control/http/util.c b/modules/control/http/util.c
index 69de4a65aaca76bdd93c52eccb70bc9f376e534a..053e3ff391c18b688d27eceffaab3100fea2ab24 100644 (file)
--- a/modules/control/http/util.c
+++ b/modules/control/http/util.c
@@ -349,7 +349,7 @@ void PlaylistListNode( intf_thread_t *p_intf, playlist_t *p_pl,
             return;
 
         mvar_t *itm = mvar_New( name, "set" );
-        if( p_item->p_input->i_id == p_node->p_input->i_id )
+        if( p_item->p_input == p_node->p_input )
             mvar_AppendNewVar( itm, "current", "1" );
         else
             mvar_AppendNewVar( itm, "current", "0" );

diff --git a/src/playlist/item.c b/src/playlist/item.c
index 4f8b2cdd723669a95535f10f8a59d34cc8e0ce57..19e9799609ae9a055577c6405dabc2263229513d 100644 (file)
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -481,8 +481,8 @@ int playlist_BothAddInput( playlist_t *p_playlist,
     }
     for( i_top = 0 ; i_top < p_playlist->p_root_onelevel->i_children; i_top++ )
     {
-        if( p_playlist->p_root_onelevel->pp_children[i_top]->p_input->i_id ==
-                             p_up->p_input->i_id )
+        if( p_playlist->p_root_onelevel->pp_children[i_top]->p_input ==
+                             p_up->p_input )
         {
             AddItem( p_playlist, p_item_one,
                      p_playlist->p_root_onelevel->pp_children[i_top],

diff --git a/src/playlist/search.c b/src/playlist/search.c
index 262138f8b2e935d125627c62ef58127bfa4a5be6..8de86c67a3befa81197bc03847ee352b8108dfaf 100644 (file)
--- a/src/playlist/search.c
+++ b/src/playlist/search.c
@@ -71,7 +71,7 @@ playlist_item_t* playlist_ItemGetByInput( playlist_t * p_playlist,
     /** \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( ARRAY_VAL(p_playlist->all_items, i)->p_input == p_item )
         {
             return ARRAY_VAL(p_playlist->all_items, i);
         }

diff --git a/src/playlist/tree.c b/src/playlist/tree.c
index 1eab637c0ab5aa5467e2a02f5f29b8ea7d7d5101..32ef051be5999cde7fcacc6e3b6441df2ac441f2 100644 (file)
--- a/src/playlist/tree.c
+++ b/src/playlist/tree.c
@@ -311,8 +311,8 @@ playlist_item_t * playlist_GetPreferredNode( playlist_t *p_playlist,
             return p_node;
         for( i = 0 ; i< p_playlist->p_root_onelevel->i_children; i++ )
         {
-            if( p_playlist->p_root_onelevel->pp_children[i]->p_input->i_id ==
-                    p_node->p_input->i_id )
+            if( p_playlist->p_root_onelevel->pp_children[i]->p_input ==
+                    p_node->p_input )
                 return p_playlist->p_root_onelevel->pp_children[i];
         }
     }
@@ -322,8 +322,8 @@ playlist_item_t * playlist_GetPreferredNode( playlist_t *p_playlist,
             return p_node;
         for( i = 0 ; i< p_playlist->p_root_category->i_children; i++ )
         {
-            if( p_playlist->p_root_category->pp_children[i]->p_input->i_id ==
-                    p_node->p_input->i_id )
+            if( p_playlist->p_root_category->pp_children[i]->p_input ==
+                    p_node->p_input )
                 return p_playlist->p_root_category->pp_children[i];
         }
     }