X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fitem.c;h=09e14e8e24b358ae4752e9696ab28f5bfdd4c36f;hb=d11fd0d1e5433a5299fbf0f0150178178ebd3f83;hp=ac5bb5a2768622f495778ed17aa1e8c61e052a65;hpb=bf4a300705421cd16dd93e715b352a0a9f606f1b;p=vlc

diff --git a/src/input/item.c b/src/input/item.c
index ac5bb5a276..09e14e8e24 100644
--- a/src/input/item.c
+++ b/src/input/item.c
@@ -26,7 +26,7 @@
 #endif
 #include <assert.h>
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "vlc_playlist.h"
 #include "vlc_interface.h"
 
@@ -34,6 +34,103 @@
 
 static void GuessType( input_item_t *p_item );
 
+/** Stuff moved out of vlc_input.h -- FIXME: should probably not be inline
+ * anyway. */
+static inline void input_item_Init( vlc_object_t *p_o, input_item_t *p_i )
+{
+    memset( p_i, 0, sizeof(input_item_t) );
+    p_i->psz_name = NULL;
+    p_i->psz_uri = NULL;
+    TAB_INIT( p_i->i_es, p_i->es );
+    TAB_INIT( p_i->i_options, p_i->ppsz_options );
+    p_i->optflagv = NULL, p_i->optflagc = 0;
+    TAB_INIT( p_i->i_categories, p_i->pp_categories );
+
+    p_i->i_type = ITEM_TYPE_UNKNOWN;
+    p_i->b_fixed_name = true;
+
+    p_i->p_stats = NULL;
+    p_i->p_meta = NULL;
+
+    vlc_mutex_init( &p_i->lock );
+    vlc_event_manager_t * p_em = &p_i->event_manager;
+    vlc_event_manager_init( p_em, p_i, p_o );
+    vlc_event_manager_register_event_type( p_em, vlc_InputItemMetaChanged );
+    vlc_event_manager_register_event_type( p_em, vlc_InputItemSubItemAdded );
+    vlc_event_manager_register_event_type( p_em, vlc_InputItemDurationChanged );
+    vlc_event_manager_register_event_type( p_em, vlc_InputItemPreparsedChanged );
+    vlc_event_manager_register_event_type( p_em, vlc_InputItemNameChanged );
+    vlc_event_manager_register_event_type( p_em, vlc_InputItemInfoChanged );
+    vlc_event_manager_register_event_type( p_em, vlc_InputItemErrorWhenReadingChanged );
+}
+
+static inline void input_item_Clean( input_item_t *p_i )
+{
+    int i;
+
+    vlc_event_manager_fini( &p_i->event_manager );
+
+    free( p_i->psz_name );
+    free( p_i->psz_uri );
+    if( p_i->p_stats )
+    {
+        vlc_mutex_destroy( &p_i->p_stats->lock );
+        free( p_i->p_stats );
+    }
+
+    if( p_i->p_meta )
+        vlc_meta_Delete( p_i->p_meta );
+
+    for( i = 0; i < p_i->i_options; i++ )
+        free( p_i->ppsz_options[i] );
+    TAB_CLEAN( p_i->i_options, p_i->ppsz_options );
+    free( p_i->optflagv);
+
+    for( i = 0; i < p_i->i_es; i++ )
+    {
+        es_format_Clean( p_i->es[i] );
+        free( p_i->es[i] );
+    }
+    TAB_CLEAN( p_i->i_es, p_i->es );
+
+    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 );
+    }
+    TAB_CLEAN( p_i->i_categories, p_i->pp_categories );
+
+    vlc_mutex_destroy( &p_i->lock );
+}
+
+void input_item_SetHasErrorWhenReading( input_item_t *p_i, bool error )
+{
+    vlc_event_t event;
+
+    if( p_i->b_error_when_reading == error )
+        return;
+
+    p_i->b_error_when_reading = error;
+
+    /* Notify interested third parties */
+    event.type = vlc_InputItemErrorWhenReadingChanged;
+    event.u.input_item_error_when_reading_changed.new_value = error;
+    vlc_event_send( &p_i->event_manager, &event );
+}
+
 void input_item_SetMeta( input_item_t *p_i, vlc_meta_type_t meta_type, const char *psz_val )
 {
     vlc_event_t event;
@@ -69,7 +166,7 @@ input_item_t *input_GetItem( input_thread_t *p_input )
  *         empty string otherwise. The caller should free the returned
  *         pointer.
  */
-char *input_ItemGetInfo( input_item_t *p_i,
+char *input_item_GetInfo( input_item_t *p_i,
                               const char *psz_cat,
                               const char *psz_name )
 {
@@ -98,24 +195,27 @@ char *input_ItemGetInfo( input_item_t *p_i,
     return strdup( "" );
 }
 
-static void input_ItemDestroy ( gc_object_t *p_this )
+static void input_item_Destroy ( gc_object_t *p_this )
 {
     vlc_object_t *p_obj = (vlc_object_t *)p_this->p_destructor_arg;
+    libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc);
     input_item_t *p_input = (input_item_t *) p_this;
     int i;
 
-    playlist_t *p_playlist = pl_Yield( p_obj );
-    input_ItemClean( p_input );
+    input_item_Clean( p_input );
+
+    vlc_object_lock( p_obj->p_libvlc );
 
-    ARRAY_BSEARCH( p_playlist->input_items,->i_id, int, p_input->i_id, i);
+    ARRAY_BSEARCH( priv->input_items,->i_id, int, p_input->i_id, i);
     if( i != -1 )
-        ARRAY_REMOVE( p_playlist->input_items, i);
+        ARRAY_REMOVE( priv->input_items, i);
+
+    vlc_object_unlock( p_obj->p_libvlc );
 
-    pl_Release( p_obj );
     free( p_input );
 }
 
-int input_ItemAddOpt( input_item_t *p_input, const char *psz_option,
+int input_item_AddOpt( input_item_t *p_input, const char *psz_option,
                       unsigned flags )
 {
     int err = VLC_SUCCESS;
@@ -147,7 +247,7 @@ out:
     return err;
 }
 
-int input_ItemAddInfo( input_item_t *p_i,
+int input_item_AddInfo( input_item_t *p_i,
                             const char *psz_cat,
                             const char *psz_name,
                             const char *psz_format, ... )
@@ -206,7 +306,7 @@ int input_ItemAddInfo( input_item_t *p_i,
     }
 
     va_start( args, psz_format );
-    if( vasprintf( &p_info->psz_value, psz_format, args) )
+    if( vasprintf( &p_info->psz_value, psz_format, args) == -1 )
         p_info->psz_value = NULL;
     va_end( args );
 
@@ -215,47 +315,55 @@ int input_ItemAddInfo( input_item_t *p_i,
     return p_info->psz_value ? VLC_SUCCESS : VLC_ENOMEM;
 }
 
-input_item_t *input_ItemGetById( playlist_t *p_playlist, int i_id )
+input_item_t *__input_item_GetById( vlc_object_t *p_obj, int i_id )
 {
+    libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc);
+    input_item_t * p_ret = NULL;
     int i;
-    ARRAY_BSEARCH( p_playlist->input_items, ->i_id, int, i_id, i);
+
+    vlc_object_lock( p_obj->p_libvlc );
+
+    ARRAY_BSEARCH( priv->input_items, ->i_id, int, i_id, i);
     if( i != -1 )
-        return ARRAY_VAL( p_playlist->input_items, i);
-    return NULL;
+        p_ret = ARRAY_VAL( priv->input_items, i);
+
+    vlc_object_unlock( p_obj->p_libvlc );
+
+    return p_ret;
 }
 
-input_item_t *__input_ItemNewExt( vlc_object_t *p_obj, const char *psz_uri,
+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,
                                   mtime_t i_duration )
 {
-    return input_ItemNewWithType( p_obj, psz_uri, psz_name,
+    return input_item_NewWithType( p_obj, psz_uri, psz_name,
                                   i_options, ppsz_options,
                                   i_duration, ITEM_TYPE_UNKNOWN );
 }
 
 
-input_item_t *input_ItemNewWithType( vlc_object_t *p_obj, const char *psz_uri,
+input_item_t *input_item_NewWithType( vlc_object_t *p_obj, const char *psz_uri,
                                 const char *psz_name,
                                 int i_options,
                                 const char *const *ppsz_options,
                                 mtime_t i_duration,
                                 int i_type )
 {
-    playlist_t *p_playlist = pl_Yield( p_obj );
+    libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc);
+
     DECMALLOC_NULL( p_input, input_item_t );
 
-    input_ItemInit( p_obj, p_input );
-    vlc_gc_init( p_input, input_ItemDestroy, (void *)p_obj );
+    input_item_Init( p_obj, p_input );
+    vlc_gc_init( p_input, input_item_Destroy, (void *)p_obj->p_libvlc );
 
-    PL_LOCK;
-    p_input->i_id = ++p_playlist->i_last_input_id;
-    ARRAY_APPEND( p_playlist->input_items, p_input );
-    PL_UNLOCK;
-    pl_Release( p_obj );
+    vlc_object_lock( p_obj->p_libvlc );
+    p_input->i_id = ++priv->i_last_input_id;
+    ARRAY_APPEND( priv->input_items, p_input );
+    vlc_object_unlock( p_obj->p_libvlc );
 
-    p_input->b_fixed_name = VLC_FALSE;
+    p_input->b_fixed_name = false;
 
     if( psz_uri )
         p_input->psz_uri = strdup( psz_uri );
@@ -263,14 +371,13 @@ input_item_t *input_ItemNewWithType( vlc_object_t *p_obj, const char *psz_uri,
         p_input->psz_uri = NULL;
 
     p_input->i_type = i_type;
-    p_input->b_prefers_tree = VLC_FALSE;
 
     if( p_input->i_type == ITEM_TYPE_UNKNOWN )
         GuessType( p_input );
 
     if( psz_name != NULL )
         p_input->psz_name = strdup( psz_name );
-    else if( p_input->i_type == ITEM_TYPE_FILE )
+    else if( p_input->i_type == ITEM_TYPE_FILE && p_input->psz_uri )
     {
         const char *psz_filename = strrchr( p_input->psz_uri, DIR_SEP_CHAR );
         if( psz_filename && *psz_filename == DIR_SEP_CHAR )
@@ -279,12 +386,12 @@ input_item_t *input_ItemNewWithType( vlc_object_t *p_obj, const char *psz_uri,
                                     ? psz_filename : p_input->psz_uri );
     }
     else
-        p_input->psz_name = strdup( p_input->psz_uri );
+        p_input->psz_name = p_input->psz_uri ? strdup( p_input->psz_uri ) : NULL;
 
     p_input->i_duration = i_duration;
 
     for( int i = 0; i < i_options; i++ )
-        input_ItemAddOption( p_input, ppsz_options[i] );
+        input_item_AddOption( p_input, ppsz_options[i] );
     return p_input;
 }
 
@@ -311,6 +418,12 @@ static void GuessType( input_item_t *p_item)
         { NULL, 0 }
     };
 
+    if( !p_item->psz_uri )
+    {
+        p_item->i_type = ITEM_TYPE_FILE;
+        return;
+    }
+
     for( i = 0; types_array[i].psz_search != NULL; i++ )
     {
         if( !strncmp( p_item->psz_uri, types_array[i].psz_search,