X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Finput%2Fitem.c;h=df4e15967ef345a891f4ca769b4f7ee43a8e4a30;hb=c12acbd7d48431d7b5029d765e69e87378aca7a2;hp=5fea1217d4d8338af2112f436593a6b29d628d53;hpb=85297c0a112a14635a7b810c8a34970704ff0cb9;p=vlc

diff --git a/src/input/item.c b/src/input/item.c
index 5fea1217d4..df4e15967e 100644
--- a/src/input/item.c
+++ b/src/input/item.c
@@ -30,8 +30,10 @@
 #include <vlc_url.h>
 #include "vlc_playlist.h"
 #include "vlc_interface.h"
+#include <vlc_charset.h>
 
 #include "item.h"
+#include "info.h"
 
 static int GuessType( const input_item_t *p_item );
 
@@ -102,23 +104,7 @@ static inline void input_item_Clean( input_item_t *p_i )
     TAB_CLEAN( p_i->i_epg, p_i->pp_epg );
 
     for( i = 0; i < p_i->i_categories; i++ )
-    {
-        info_category_t *p_category = p_i->pp_categories[i];
-        int j;
-
-        for( j = 0; j < p_category->i_infos; j++ )
-        {
-            struct info_t *p_info = p_category->pp_infos[j];
-
-            free( p_info->psz_name);
-            free( p_info->psz_value );
-            free( p_info );
-        }
-        TAB_CLEAN( p_category->i_infos, p_category->pp_infos );
-
-        free( p_category->psz_name );
-        free( p_category );
-    }
+        info_category_Delete( p_i->pp_categories[i] );
     TAB_CLEAN( p_i->i_categories, p_i->pp_categories );
 
     vlc_mutex_destroy( &p_i->lock );
@@ -230,7 +216,7 @@ void input_item_SetMeta( input_item_t *p_i, vlc_meta_type_t meta_type, const cha
 }
 
 /* FIXME GRRRRRRRRRR args should be in the reverse order to be
- * consistant with (nearly?) all or copy funcs */
+ * consistent with (nearly?) all or copy funcs */
 void input_item_CopyOptions( input_item_t *p_parent,
                              input_item_t *p_child )
 {
@@ -249,39 +235,28 @@ 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
  * Like the playlist, that there is a new sub item. With this design
  * It is not the input item's responsability to keep all the ref of
  * the input item children. */
-void input_item_AddSubItem( input_item_t *p_parent, input_item_t *p_child )
+void input_item_PostSubItem( input_item_t *p_parent, input_item_t *p_child )
 {
-    vlc_mutex_lock( &p_parent->lock );
-    p_parent->i_type = ITEM_TYPE_PLAYLIST;
-    vlc_mutex_unlock( &p_parent->lock );
-
-    notify_subitem_added(p_parent, p_child);
-
     input_item_node_t *p_node = input_item_node_Create( p_parent );
     input_item_node_AppendItem( p_node, p_child );
-    input_item_AddSubItemTree( p_node );
-    input_item_node_Delete( p_node );
-}
-
-void input_item_AddSubItemTree ( input_item_node_t *p_root )
-{
-    vlc_event_t event;
-    event.type = vlc_InputItemSubItemTreeAdded;
-    event.u.input_item_subitem_tree_added.p_root = p_root;
-    vlc_event_send( &p_root->p_item->event_manager, &event );
+    input_item_node_PostAndDelete( p_node );
 }
 
 bool input_item_HasErrorWhenReading( input_item_t *p_item )
@@ -382,14 +357,17 @@ char *input_item_GetURI( input_item_t *p_i )
     vlc_mutex_unlock( &p_i->lock );
     return psz_s;
 }
+
 void input_item_SetURI( input_item_t *p_i, const char *psz_uri )
 {
-    vlc_mutex_lock( &p_i->lock );
+    assert( psz_uri );
 #ifndef NDEBUG
-    if( !strstr( psz_uri, "://" ) || strstr( psz_uri, " " ) || strstr( psz_uri, "\"" ) )
-        fprintf( stderr, "input_item_SetURI() was likely called with a path. FIXME\n" );
+    if( !strstr( psz_uri, "://" )
+     || strchr( psz_uri, ' ' ) || strchr( psz_uri, '"' ) )
+        fprintf( stderr, "Warning: %s(\"%s\"): file path instead of URL.\n",
+                 __func__, psz_uri );
 #endif
-
+    vlc_mutex_lock( &p_i->lock );
     free( p_i->psz_uri );
     p_i->psz_uri = strdup( psz_uri );
 
@@ -409,7 +387,10 @@ void input_item_SetURI( input_item_t *p_i, const char *psz_uri )
 
         /* Make the name more readable */
         if( p_i->psz_name )
+        {
             decode_URI( p_i->psz_name );
+            EnsureUTF8( p_i->psz_name );
+        }
     }
     else
     {   /* Strip login and password from title */
@@ -536,6 +517,24 @@ out:
     return err;
 }
 
+static info_category_t *InputItemFindCat( input_item_t *p_item,
+                                          int *pi_index, const char *psz_cat )
+{
+    vlc_assert_locked( &p_item->lock );
+    for( int i = 0; i < p_item->i_categories && psz_cat; i++ )
+    {
+        info_category_t *p_cat = p_item->pp_categories[i];
+
+        if( !strcmp( p_cat->psz_name, psz_cat ) )
+        {
+            if( pi_index )
+                *pi_index = i;
+            return p_cat;
+        }
+    }
+    return NULL;
+}
+
 /**
  * Get a info item from a given category in a given input item.
  *
@@ -552,21 +551,15 @@ char *input_item_GetInfo( input_item_t *p_i,
 {
     vlc_mutex_lock( &p_i->lock );
 
-    for( int i = 0; i< p_i->i_categories; i++ )
+    const info_category_t *p_cat = InputItemFindCat( p_i, NULL, psz_cat );
+    if( p_cat )
     {
-        const info_category_t *p_cat = p_i->pp_categories[i];
-
-        if( !psz_cat || strcmp( p_cat->psz_name, psz_cat ) )
-            continue;
-
-        for( int j = 0; j < p_cat->i_infos; j++ )
+        info_t *p_info = info_category_FindInfo( p_cat, NULL, psz_name );
+        if( p_info && p_info->psz_value )
         {
-            if( !strcmp( p_cat->pp_infos[j]->psz_name, psz_name ) )
-            {
-                char *psz_ret = strdup( p_cat->pp_infos[j]->psz_value );
-                vlc_mutex_unlock( &p_i->lock );
-                return psz_ret;
-            }
+            char *psz_ret = strdup( p_info->psz_value );
+            vlc_mutex_unlock( &p_i->lock );
+            return psz_ret;
         }
     }
     vlc_mutex_unlock( &p_i->lock );
@@ -578,58 +571,21 @@ static int InputItemVaAddInfo( input_item_t *p_i,
                                const char *psz_name,
                                const char *psz_format, va_list args )
 {
-    int i;
-    info_t *p_info = NULL;
-    info_category_t *p_cat = NULL ;
-
     vlc_assert_locked( &p_i->lock );
 
-    for( i = 0 ; i < p_i->i_categories ; i ++ )
-    {
-        if( !strcmp( p_i->pp_categories[i]->psz_name, psz_cat ) )
-        {
-            p_cat = p_i->pp_categories[i];
-            break;
-        }
-    }
+    info_category_t *p_cat = InputItemFindCat( p_i, NULL, psz_cat );
     if( !p_cat )
     {
-        if( !(p_cat = malloc( sizeof(*p_cat) )) )
+        p_cat = info_category_New( psz_cat );
+        if( !p_cat )
             return VLC_ENOMEM;
-
-        p_cat->psz_name = strdup( psz_cat );
-        p_cat->i_infos = 0;
-        p_cat->pp_infos = 0;
         INSERT_ELEM( p_i->pp_categories, p_i->i_categories, p_i->i_categories,
                      p_cat );
     }
-
-    for( i = 0; i< p_cat->i_infos; i++ )
-    {
-        if( !strcmp( p_cat->pp_infos[i]->psz_name, psz_name ) )
-        {
-            p_info = p_cat->pp_infos[i];
-            break;
-        }
-    }
-
-    if( !p_info )
-    {
-        if( ( p_info = malloc( sizeof( *p_info ) ) ) == NULL )
-            return VLC_ENOMEM;
-
-        INSERT_ELEM( p_cat->pp_infos, p_cat->i_infos, p_cat->i_infos, p_info );
-        p_info->psz_name = strdup( psz_name );
-    }
-    else
-    {
-        free( p_info->psz_value );
-    }
-
-    if( vasprintf( &p_info->psz_value, psz_format, args ) == -1 )
-        p_info->psz_value = NULL;
-
-    return p_info->psz_value ? VLC_SUCCESS : VLC_ENOMEM;
+    info_t *p_info = info_category_VaAddInfo( p_cat, psz_name, psz_format, args );
+    if( !p_info || !p_info->psz_value )
+        return VLC_EGENERIC;
+    return VLC_SUCCESS;
 }
 
 static int InputItemAddInfo( input_item_t *p_i,
@@ -676,21 +632,10 @@ int input_item_DelInfo( input_item_t *p_i,
                         const char *psz_cat,
                         const char *psz_name )
 {
-    info_category_t *p_cat = NULL;
-    int i_cat;
-    int i;
-
     vlc_mutex_lock( &p_i->lock );
-    for( i_cat = 0; i_cat < p_i->i_categories; i_cat++ )
-    {
-        if( !strcmp( p_i->pp_categories[i_cat]->psz_name,
-                     psz_cat ) )
-        {
-            p_cat = p_i->pp_categories[i_cat];
-            break;
-        }
-    }
-    if( p_cat == NULL )
+    int i_cat;
+    info_category_t *p_cat = InputItemFindCat( p_i, &i_cat, psz_cat );
+    if( !p_cat )
     {
         vlc_mutex_unlock( &p_i->lock );
         return VLC_EGENERIC;
@@ -699,18 +644,8 @@ int input_item_DelInfo( input_item_t *p_i,
     if( psz_name )
     {
         /* Remove a specific info */
-        for( i = 0; i < p_cat->i_infos; i++ )
-        {
-            if( !strcmp( p_cat->pp_infos[i]->psz_name, psz_name ) )
-            {
-                free( p_cat->pp_infos[i]->psz_name );
-                free( p_cat->pp_infos[i]->psz_value );
-                free( p_cat->pp_infos[i] );
-                REMOVE_ELEM( p_cat->pp_infos, p_cat->i_infos, i );
-                break;
-            }
-        }
-        if( i >= p_cat->i_infos )
+        int i_ret = info_category_DeleteInfo( p_cat, psz_name );
+        if( i_ret )
         {
             vlc_mutex_unlock( &p_i->lock );
             return VLC_EGENERIC;
@@ -719,19 +654,9 @@ int input_item_DelInfo( input_item_t *p_i,
     else
     {
         /* Remove the complete categorie */
-        for( i = 0; i < p_cat->i_infos; i++ )
-        {
-            free( p_cat->pp_infos[i]->psz_name );
-            free( p_cat->pp_infos[i]->psz_value );
-            free( p_cat->pp_infos[i] );
-        }
-        free( p_cat->pp_infos );
+        info_category_Delete( p_cat );
         REMOVE_ELEM( p_i->pp_categories, p_i->i_categories, i_cat );
     }
-
-    // Free the category
-    free( p_cat->psz_name );
-    free( p_cat );
     vlc_mutex_unlock( &p_i->lock );
 
 
@@ -741,6 +666,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 )
@@ -849,13 +819,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,
@@ -888,7 +858,6 @@ input_item_t *input_item_NewWithType( vlc_object_t *p_obj, const char *psz_uri,
     p_input->b_fixed_name = false;
 
     p_input->i_type = i_type;
-    p_input->b_prefers_tree = false;
 
     if( psz_uri )
         input_item_SetURI( p_input, psz_uri );
@@ -906,6 +875,31 @@ input_item_t *input_item_NewWithType( vlc_object_t *p_obj, const char *psz_uri,
     return p_input;
 }
 
+input_item_t *input_item_Copy( vlc_object_t *p_obj, input_item_t *p_input )
+{
+    vlc_mutex_lock( &p_input->lock );
+
+    input_item_t *p_new_input =
+        input_item_NewWithType( p_obj,
+                                p_input->psz_uri, p_input->psz_name,
+                                0, NULL, 0, p_input->i_duration,
+                                p_input->i_type );
+
+    if( p_new_input )
+    {
+        for( int i = 0 ; i< p_input->i_options; i++ )
+        {
+            input_item_AddOption( p_new_input,
+                                  p_input->ppsz_options[i],
+                                  p_input->optflagv[i] );
+        }
+    }
+
+    vlc_mutex_unlock( &p_input->lock );
+
+    return p_new_input;
+}
+
 struct item_type_entry
 {
     const char psz_scheme[7];
@@ -1034,8 +1028,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,
@@ -1043,3 +1035,15 @@ void input_item_node_AppendNode( input_item_node_t *p_parent, input_item_node_t
                  p_child );
     p_child->p_parent = p_parent;
 }
+
+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;
+  vlc_event_send( &p_root->p_item->event_manager, &event );
+
+  input_item_node_Delete( p_root );
+}