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

diff --git a/src/input/item.c b/src/input/item.c
index 4aed77ba6d..1dab190711 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"
 
@@ -53,15 +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_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 )
@@ -116,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;
@@ -183,18 +198,19 @@ char *input_ItemGetInfo( input_item_t *p_i,
 static void input_ItemDestroy ( 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;
 
     input_ItemClean( p_input );
 
-    vlc_mutex_lock( &p_obj->p_libvlc->object_lock );
+    vlc_object_lock( p_obj->p_libvlc );
 
-    ARRAY_BSEARCH( p_obj->p_libvlc->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_obj->p_libvlc->input_items, i);
+        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 );
 }
@@ -290,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 );
 
@@ -301,16 +317,17 @@ int input_ItemAddInfo( input_item_t *p_i,
 
 input_item_t *__input_ItemGetById( 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;
 
-    vlc_mutex_lock( &p_obj->p_libvlc->object_lock );
+    vlc_object_lock( p_obj->p_libvlc );
 
-    ARRAY_BSEARCH( p_obj->p_libvlc->input_items, ->i_id, int, i_id, i);
+    ARRAY_BSEARCH( priv->input_items, ->i_id, int, i_id, i);
     if( i != -1 )
-        p_ret = ARRAY_VAL( p_obj->p_libvlc->input_items, i);
+        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;
 }
@@ -334,15 +351,17 @@ input_item_t *input_ItemNewWithType( vlc_object_t *p_obj, const char *psz_uri,
                                 mtime_t i_duration,
                                 int i_type )
 {
+    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 );
+    vlc_gc_init( p_input, input_ItemDestroy, (void *)p_obj->p_libvlc );
 
-    vlc_mutex_lock( &p_obj->p_libvlc->object_lock );
-    p_input->i_id = ++p_obj->p_libvlc->i_last_input_id;
-    ARRAY_APPEND( p_obj->p_libvlc->input_items, p_input );
-    vlc_mutex_unlock( &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_object_unlock( p_obj->p_libvlc );
 
     p_input->b_fixed_name = false;