X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fitem.c;h=29446ae9c40d84ce06d2d436e6c5e326319981e9;hb=8d5e7cc89b89c12e9fceaae03dfab5f63421c27d;hp=3ce82c63dba832cbeb0c8ee363ed44799b31fe50;hpb=fea5f220608be962663f6ef8d99e074e2bea01e5;p=vlc

diff --git a/src/input/item.c b/src/input/item.c
index 3ce82c63db..29446ae9c4 100644
--- a/src/input/item.c
+++ b/src/input/item.c
@@ -234,13 +234,17 @@ void input_item_CopyOptions( input_item_t *p_parent,
     vlc_mutex_unlock( &p_parent->lock );
 }
 
-static void notify_subitem_added(input_item_t *p_parent, input_item_t *p_child)
+static void post_subitems( input_item_node_t *p_node )
 {
-    /* Notify interested third parties */
-    vlc_event_t event;
-    event.type = vlc_InputItemSubItemAdded;
-    event.u.input_item_subitem_added.p_new_child = p_child;
-    vlc_event_send( &p_parent->event_manager, &event );
+    for( int i = 0; i < p_node->i_children; i++ )
+    {
+        vlc_event_t event;
+        event.type = vlc_InputItemSubItemAdded;
+        event.u.input_item_subitem_added.p_new_child = p_node->pp_children[i]->p_item;
+        vlc_event_send( &p_node->p_item->event_manager, &event );
+
+        post_subitems( p_node->pp_children[i] );
+    }
 }
 
 /* This won't hold the item, but can tell to interested third parties
@@ -625,7 +629,6 @@ int input_item_DelInfo( input_item_t *p_i,
                         const char *psz_cat,
                         const char *psz_name )
 {
-
     vlc_mutex_lock( &p_i->lock );
     int i_cat;
     info_category_t *p_cat = InputItemFindCat( p_i, &i_cat, psz_cat );
@@ -660,6 +663,51 @@ int input_item_DelInfo( input_item_t *p_i,
 
     return VLC_SUCCESS;
 }
+void input_item_ReplaceInfos( input_item_t *p_item, info_category_t *p_cat )
+{
+    vlc_mutex_lock( &p_item->lock );
+    int i_cat;
+    info_category_t *p_old = InputItemFindCat( p_item, &i_cat, p_cat->psz_name );
+    if( p_old )
+    {
+        info_category_Delete( p_old );
+        p_item->pp_categories[i_cat] = p_cat;
+    }
+    else
+    {
+        INSERT_ELEM( p_item->pp_categories, p_item->i_categories, p_item->i_categories,
+                     p_cat );
+    }
+    vlc_mutex_unlock( &p_item->lock );
+
+
+    vlc_event_t event;
+    event.type = vlc_InputItemInfoChanged;
+    vlc_event_send( &p_item->event_manager, &event );
+}
+void input_item_MergeInfos( input_item_t *p_item, info_category_t *p_cat )
+{
+    vlc_mutex_lock( &p_item->lock );
+    info_category_t *p_old = InputItemFindCat( p_item, NULL, p_cat->psz_name );
+    if( p_old )
+    {
+        for( int i = 0; i < p_cat->i_infos; i++ )
+            info_category_ReplaceInfo( p_old, p_cat->pp_infos[i] );
+        TAB_CLEAN( p_cat->i_infos, p_cat->pp_infos );
+        info_category_Delete( p_cat );
+    }
+    else
+    {
+        INSERT_ELEM( p_item->pp_categories, p_item->i_categories, p_item->i_categories,
+                     p_cat );
+    }
+    vlc_mutex_unlock( &p_item->lock );
+
+
+    vlc_event_t event;
+    event.type = vlc_InputItemInfoChanged;
+    vlc_event_send( &p_item->event_manager, &event );
+}
 
 #define EPG_DEBUG
 void input_item_SetEpg( input_item_t *p_item, const vlc_epg_t *p_update )
@@ -768,13 +816,13 @@ void input_item_SetEpgOffline( input_item_t *p_item )
     vlc_event_send( &p_item->event_manager, &event );
 }
 
-
-input_item_t *__input_item_NewExt( vlc_object_t *p_obj, const char *psz_uri,
-                                  const char *psz_name,
-                                  int i_options,
-                                  const char *const *ppsz_options,
-                                  unsigned i_option_flags,
-                                  mtime_t i_duration )
+#undef input_item_NewExt
+input_item_t *input_item_NewExt( vlc_object_t *p_obj, const char *psz_uri,
+                                 const char *psz_name,
+                                 int i_options,
+                                 const char *const *ppsz_options,
+                                 unsigned i_option_flags,
+                                 mtime_t i_duration )
 {
     return input_item_NewWithType( p_obj, psz_uri, psz_name,
                                   i_options, ppsz_options, i_option_flags,
@@ -953,8 +1001,6 @@ input_item_node_t *input_item_node_AppendItem( input_item_node_t *p_node, input_
 
 void input_item_node_AppendNode( input_item_node_t *p_parent, input_item_node_t *p_child )
 {
-    notify_subitem_added(p_parent->p_item, p_child->p_item);
-
     assert( p_parent && p_child && p_child->p_parent == NULL );
     INSERT_ELEM( p_parent->pp_children,
                  p_parent->i_children,
@@ -965,6 +1011,8 @@ void input_item_node_AppendNode( input_item_node_t *p_parent, input_item_node_t
 
 void input_item_node_PostAndDelete( input_item_node_t *p_root )
 {
+  post_subitems( p_root );
+
   vlc_event_t event;
   event.type = vlc_InputItemSubItemTreeAdded;
   event.u.input_item_subitem_tree_added.p_root = p_root;