Removes trailing spaces. Removes tabs.

[vlc] / src / control / dynamic_media_list.c

diff --git a/src/control/dynamic_media_list.c b/src/control/dynamic_media_list.c
index 7ba933969d6be24358ef6479d895e86b6f0a36c2..b24119922a553a70d419e2d855a7804c558fc9aa 100644 (file)
--- a/src/control/dynamic_media_list.c
+++ b/src/control/dynamic_media_list.c
@@ -89,7 +89,7 @@ dynamic_list_propose_item( const libvlc_event_t * p_event, void * p_user_data )
             libvlc_media_list_unlock( p_dmlist->p_mlist );
             return;
         }
-        
+ 
         libvlc_media_list_lock( p_dmlist->p_mlist );
         libvlc_media_list_add_media_descriptor( p_dmlist->p_mlist, p_md, NULL );
         libvlc_media_list_unlock( p_dmlist->p_mlist );
@@ -113,14 +113,14 @@ dynamic_list_remove_item( const libvlc_event_t * p_event, void * p_user_data )
     if( libvlc_tag_query_match( p_dmlist->p_query, p_md, NULL ) )
     {
         int i;
-        libvlc_media_list_lock( p_dmlist->p_mlist );        
+        libvlc_media_list_lock( p_dmlist->p_mlist );
         i = libvlc_media_list_index_of_item( p_dmlist->p_mlist, p_md, NULL );
         if ( i < 0 )
         {
             /* We've missed one item addition, that could happen especially
              * if we add item in a threaded maner, so we just ignore */
             libvlc_media_list_unlock( p_dmlist->p_mlist );
-            //libvlc_media_descriptor_unlock( p_md );           
+            //libvlc_media_descriptor_unlock( p_md );
             return;
         }
         libvlc_media_list_remove_index( p_dmlist->p_mlist, i, NULL );
@@ -129,37 +129,6 @@ dynamic_list_remove_item( const libvlc_event_t * p_event, void * p_user_data )
     //libvlc_media_descriptor_unlock( p_md );
 }
 
-/**************************************************************************
- *       dynamic_list_change_item (private) (Event Callback)
- *
- * This is called if the dynamic sublist's data provider adds a new item.
- **************************************************************************/
-static void
-dynamic_list_change_item( const libvlc_event_t * p_event , void * p_user_data)
-{
-    /* Check if the item matches still our tag query */
-
-    libvlc_dynamic_media_list_t * p_dmlist = p_user_data;
-    libvlc_media_descriptor_t * p_md = p_event->u.media_list_item_changed.item;
-    int index;
-
-    libvlc_media_list_lock( p_dmlist->p_mlist );        
-    
-    index = libvlc_media_list_index_of_item( p_dmlist->p_mlist, p_md, NULL );
-    if( index < 0 )
-    {
-        libvlc_media_list_unlock( p_dmlist->p_mlist );     
-        return; /* Not found, no prob, just ignore */
-    }
-
-    //libvlc_media_descriptor_lock( p_md );
-    if( !libvlc_tag_query_match( p_dmlist->p_query, p_md, NULL ) )
-        libvlc_media_list_remove_index( p_dmlist->p_mlist, index, NULL );
-    //libvlc_media_descriptor_unlock( p_md );
-
-    libvlc_media_list_unlock( p_dmlist->p_mlist );        
-}
-
 /*
  * Public libvlc functions
  */
@@ -206,8 +175,8 @@ libvlc_dynamic_media_list_new(
     libvlc_media_list_retain( p_mlist );
     p_dmlist->p_media_provider = p_mlist;
 
-    libvlc_media_list_lock( p_mlist );        
-    
+    libvlc_media_list_lock( p_mlist );
+ 
     count = libvlc_media_list_count( p_mlist, p_e );
 
     /* This should be running in a thread, a good plan to achieve that
@@ -217,7 +186,7 @@ libvlc_dynamic_media_list_new(
         libvlc_media_descriptor_t * p_md;
         p_md = libvlc_media_list_item_at_index( p_mlist, i, p_e );
         if( libvlc_tag_query_match( p_query, p_md, NULL ) )
-            libvlc_media_list_add_media_descriptor( p_dmlist, p_md, p_e );
+            libvlc_media_list_add_media_descriptor( p_dmlist->p_mlist, p_md, p_e );
     }
 
     /* And we will listen to its event, so we can update p_dmlist->p_mlist
@@ -227,10 +196,8 @@ libvlc_dynamic_media_list_new(
                          dynamic_list_propose_item, p_dmlist, p_e );
     libvlc_event_attach( p_em, libvlc_MediaListItemDeleted,
                          dynamic_list_remove_item, p_dmlist, p_e );
-    libvlc_event_attach( p_em, libvlc_MediaListItemChanged,
-                         dynamic_list_change_item, p_dmlist, p_e );
 
-    libvlc_media_list_unlock( p_mlist );        
+    libvlc_media_list_unlock( p_mlist );
 
     /* Make sure item added/removed will gain/loose our mark */
     p_em = libvlc_media_list_event_manager( p_dmlist->p_mlist, p_e );