X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fitem.c;h=1dab190711b18c0831cebbd87933a529f699b187;hb=f2b2e37c04b2921e29daa3260dc696646ad4f10c;hp=579dac4aa18711bfd7351f6ecbb5b598e9760823;hpb=788413cf9c52db26d592426083b920cb5a364e3e;p=vlc

diff --git a/src/input/item.c b/src/input/item.c
index 579dac4aa1..1dab190711 100644
--- a/src/input/item.c
+++ b/src/input/item.c
@@ -53,19 +53,15 @@ static inline void input_ItemInit( vlc_object_t *p_o, input_item_t *p_i )
     p_i->p_meta = NULL;
 
     vlc_mutex_init( &p_i->lock );
-    vlc_event_manager_init( &p_i->event_manager, p_i, p_o );
-    vlc_event_manager_register_event_type( &p_i->event_manager,
-        vlc_InputItemMetaChanged );
-    vlc_event_manager_register_event_type( &p_i->event_manager,
-        vlc_InputItemSubItemAdded );
-    vlc_event_manager_register_event_type( &p_i->event_manager,
-        vlc_InputItemDurationChanged );
-    vlc_event_manager_register_event_type( &p_i->event_manager,
-        vlc_InputItemPreparsedChanged );
-    vlc_event_manager_register_event_type( &p_i->event_manager,
-        vlc_InputItemNameChanged );
-    vlc_event_manager_register_event_type( &p_i->event_manager,
-        vlc_InputItemInfoChanged );
+    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_ItemClean( input_item_t *p_i )
@@ -120,6 +116,21 @@ static inline void input_ItemClean( input_item_t *p_i )
     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;
@@ -193,13 +204,13 @@ static void input_ItemDestroy ( gc_object_t *p_this )
 
     input_ItemClean( p_input );
 
-    vlc_mutex_lock( &p_obj->p_libvlc->object_lock );
+    vlc_object_lock( p_obj->p_libvlc );
 
     ARRAY_BSEARCH( priv->input_items,->i_id, int, p_input->i_id, i);
     if( i != -1 )
         ARRAY_REMOVE( priv->input_items, i);
 
-    vlc_mutex_unlock( &p_obj->p_libvlc->object_lock );
+    vlc_object_unlock( p_obj->p_libvlc );
 
     free( p_input );
 }
@@ -295,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 );
 
@@ -310,13 +321,13 @@ input_item_t *__input_ItemGetById( vlc_object_t *p_obj, int i_id )
     input_item_t * p_ret = NULL;
     int i;
 
-    vlc_mutex_lock( &p_obj->p_libvlc->object_lock );
+    vlc_object_lock( p_obj->p_libvlc );
 
     ARRAY_BSEARCH( priv->input_items, ->i_id, int, i_id, i);
     if( i != -1 )
         p_ret = ARRAY_VAL( priv->input_items, i);
 
-    vlc_mutex_unlock( &p_obj->p_libvlc->object_lock );
+    vlc_object_unlock( p_obj->p_libvlc );
 
     return p_ret;
 }
@@ -345,12 +356,12 @@ input_item_t *input_ItemNewWithType( vlc_object_t *p_obj, const char *psz_uri,
     DECMALLOC_NULL( p_input, input_item_t );
 
     input_ItemInit( p_obj, p_input );
-    vlc_gc_init( p_input, input_ItemDestroy, (void *)p_obj );
+    vlc_gc_init( p_input, input_ItemDestroy, (void *)p_obj->p_libvlc );
 
-    vlc_mutex_lock( &p_obj->p_libvlc->object_lock );
+    vlc_object_lock( p_obj->p_libvlc );
     p_input->i_id = ++priv->i_last_input_id;
     ARRAY_APPEND( priv->input_items, p_input );
-    vlc_mutex_unlock( &p_obj->p_libvlc->object_lock );
+    vlc_object_unlock( p_obj->p_libvlc );
 
     p_input->b_fixed_name = false;