input: Expose input_ItemHasErrorWhenReading.

[vlc] / src / misc / events.c

diff --git a/src/misc/events.c b/src/misc/events.c
index e4e5434f9d63ee2124c11e26aa9134956ba5658a..a0a44980250cb310aca95a357f3c96513bcf7dfe 100644 (file)
--- a/src/misc/events.c
+++ b/src/misc/events.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <assert.h>
 
@@ -70,12 +70,23 @@ typedef struct vlc_event_listeners_group_t
 } vlc_event_listeners_group_t;
 
 #ifdef DEBUG_EVENT
-static const char * ppsz_event_type_to_name[] =
+static const char ppsz_event_type_to_name[][33] =
 {
+    [vlc_InputStateChanged]             = "vlc_InputStateChanged",
+    [vlc_InputSelectedStreamChanged]    = "vlc_InputSelectedStreamChanged",
+
     [vlc_InputItemMetaChanged]          = "vlc_InputItemMetaChanged",
     [vlc_InputItemSubItemAdded]         = "vlc_InputItemSubItemAdded",
+    [vlc_InputItemDurationChanged]      = "vlc_InputItemDurationChanged",
+    [vlc_InputItemPreparsedChanged]     = "vlc_InputItemPreparsedChanged",
+    [vlc_InputItemNameChanged]          = "vlc_InputItemNameChanged",
+    [vlc_InputItemInfoChanged]          = "vlc_InputItemInfoChanged",
+    [vlc_InputItemErrorWhenReadingChanged] = "vlc_InputItemErrorWhenReadingChanged",
+
     [vlc_ServicesDiscoveryItemAdded]    = "vlc_ServicesDiscoveryItemAdded",
     [vlc_ServicesDiscoveryItemRemoved]  = "vlc_ServicesDiscoveryItemRemoved"
+    [vlc_ServicesDiscoveryStarted]      = "vlc_ServicesDiscoveryStarted"
+    [vlc_ServicesDiscoveryEnded]        = "vlc_ServicesDiscoveryEnded"
 };
 #endif
 
@@ -110,12 +121,12 @@ group_contains_listener( vlc_event_listeners_group_t * group,
  * for instance).
  * p_parent_obj gives a libvlc instance
  */
-int vlc_event_manager_init( vlc_event_manager_t * p_em, void * p_obj,
-                            vlc_object_t * p_parent_obj )
+int __vlc_event_manager_init( vlc_event_manager_t * p_em, void * p_obj,
+                              vlc_object_t * p_parent_obj )
 {
     p_em->p_obj = p_obj;
     p_em->p_parent_object = p_parent_obj;
-    vlc_mutex_init( p_parent_obj, &p_em->object_lock );
+    vlc_mutex_init( &p_em->object_lock );
 
     /* We need a recursive lock here, because we need to be able
      * to call libvlc_event_detach even if vlc_event_send is in
@@ -123,7 +134,7 @@ int vlc_event_manager_init( vlc_event_manager_t * p_em, void * p_obj,
      * This ensures that after libvlc_event_detach, the callback
      * will never gets triggered.
      * */
-    vlc_mutex_init_recursive( p_parent_obj, &p_em->event_sending_lock );
+    vlc_mutex_init_recursive( &p_em->event_sending_lock );
     ARRAY_INIT( p_em->listeners_groups );
     return VLC_SUCCESS;
 }
@@ -200,7 +211,6 @@ void vlc_event_send( vlc_event_manager_t * p_em,
                     sizeof(vlc_event_listener_t)*i_cached_listeners );
             if( !array_of_cached_listeners )
             {
-                msg_Err( p_em->p_parent_object, "Not enough memory in vlc_event_send" );
                 vlc_mutex_unlock( &p_em->object_lock );
                 return;
             }