]> git.sesse.net Git - vlc/blobdiff - src/misc/events.c
Removes trailing spaces. Removes tabs.
[vlc] / src / misc / events.c
index 5eb006ab0f487ad3883275d5346f5469fc5c48d8..6e056f7ff777880b57095e83b48164b23b8c948d 100644 (file)
@@ -30,9 +30,6 @@
 
 #include <vlc/vlc.h>
 
-#include <stdio.h>                                               /* required */
-#include <stdlib.h>                                              /* malloc() */
-
 #include <assert.h>
 
 #include <vlc_events.h>
@@ -42,6 +39,8 @@
  * Documentation : Read vlc_events.h
  *****************************************************************************/
 
+//#define DEBUG_EVENT
+
 /*****************************************************************************
  *  Private types.
  *****************************************************************************/
@@ -50,6 +49,9 @@ typedef struct vlc_event_listener_t
 {
     void *               p_user_data;
     vlc_event_callback_t pf_callback;
+#ifdef DEBUG_EVENT
+    char *               psz_debug_name;
+#endif
 } vlc_event_listener_t;
 
 typedef struct vlc_event_listeners_group_t
@@ -58,19 +60,33 @@ typedef struct vlc_event_listeners_group_t
     DECL_ARRAY(struct vlc_event_listener_t *) listeners;
 } vlc_event_listeners_group_t;
 
+#ifdef DEBUG_EVENT
+static const char * ppsz_event_type_to_name[] =
+{
+    [vlc_InputItemMetaChanged]          = "vlc_InputItemMetaChanged",
+    [vlc_InputItemSubItemAdded]         = "vlc_InputItemSubItemAdded",
+    [vlc_ServicesDiscoveryItemAdded]    = "vlc_ServicesDiscoveryItemAdded",
+    [vlc_ServicesDiscoveryItemRemoved]  = "vlc_ServicesDiscoveryItemRemoved"
+};
+#endif
+
 /*****************************************************************************
- * 
+ *
  *****************************************************************************/
 
 /**
  * Initialize event manager object
- * p_this is the object that contains the event manager. But not
+ * p_obj is the object that contains the event manager. But not
  * necessarily a vlc_object_t (an input_item_t is not a vlc_object_t
  * for instance).
+ * p_parent_obj gives a libvlc instance
  */
-int event_manager_Create( vlc_event_manager_t * p_em, void * p_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 );
     ARRAY_INIT( p_em->listeners_groups );
     return VLC_SUCCESS;
 }
@@ -78,24 +94,27 @@ int event_manager_Create( vlc_event_manager_t * p_em, void * p_obj )
 /**
  * Destroy the event manager
  */
-void event_manager_Destroy( vlc_event_manager_t * p_em )
+void vlc_event_manager_fini( vlc_event_manager_t * p_em )
 {
     struct vlc_event_listeners_group_t * listeners_group;
     struct vlc_event_listener_t * listener;
 
+    vlc_mutex_destroy( &p_em->object_lock );
+
     FOREACH_ARRAY( listeners_group, p_em->listeners_groups )
         FOREACH_ARRAY( listener, listeners_group->listeners )
             free( listener );
         FOREACH_END()
+        ARRAY_RESET( listeners_group->listeners );
         free( listeners_group );
     FOREACH_END()
-    free( p_em );
+    ARRAY_RESET( p_em->listeners_groups );
 }
 
 /**
  * Destroy the event manager
  */
-int event_manager_RegisterEventType(
+int vlc_event_manager_register_event_type(
         vlc_event_manager_t * p_em,
         vlc_event_type_t event_type )
 {
@@ -107,8 +126,10 @@ int event_manager_RegisterEventType(
 
     listeners_group->event_type = event_type;
     ARRAY_INIT( listeners_group->listeners );
-
+    vlc_mutex_lock( &p_em->object_lock );
     ARRAY_APPEND( p_em->listeners_groups, listeners_group );
+    vlc_mutex_unlock( &p_em->object_lock );
 
     return VLC_SUCCESS;
 }
@@ -116,52 +137,112 @@ int event_manager_RegisterEventType(
 /**
  * Send an event to the listener attached to this p_em.
  */
-void event_Send( vlc_event_manager_t * p_em,
-                 vlc_event_t * p_event )
+void vlc_event_send( vlc_event_manager_t * p_em,
+                     vlc_event_t * p_event )
 {
     vlc_event_listeners_group_t * listeners_group;
     vlc_event_listener_t * listener;
+    vlc_event_listener_t * array_of_cached_listeners = NULL;
+    vlc_event_listener_t * cached_listener;
+    int i, i_cached_listeners = 0;
 
     /* Fill event with the sending object now */
     p_event->p_obj = p_em->p_obj;
 
+    vlc_mutex_lock( &p_em->object_lock );
     FOREACH_ARRAY( listeners_group, p_em->listeners_groups )
         if( listeners_group->event_type == p_event->type )
         {
-            /* We found the group, now send every one the event */
+            if( listeners_group->listeners.i_size <= 0 )
+                break;
+
+            /* Save the function to call */
+            i_cached_listeners = listeners_group->listeners.i_size;
+            array_of_cached_listeners = malloc(
+                    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;
+            }
+
+            cached_listener = array_of_cached_listeners;
             FOREACH_ARRAY( listener, listeners_group->listeners )
-                listener->pf_callback( p_event, listener->p_user_data );
+                memcpy( cached_listener, listener, sizeof(vlc_event_listener_t));
+#ifdef DEBUG_EVENT
+                cached_listener->psz_debug_name = strdup(cached_listener->psz_debug_name);
+#endif
+                cached_listener++;
             FOREACH_END()
+
             break;
         }
     FOREACH_END()
+    vlc_mutex_unlock( &p_em->object_lock );
+    /* Call the function attached */
+    cached_listener = array_of_cached_listeners;
+    for( i = 0; i < i_cached_listeners; i++ )
+    {
+#ifdef DEBUG_EVENT
+        msg_Dbg( p_em->p_parent_object,
+                    "Calling '%s' with a '%s' event (data %p)",
+                    cached_listener->psz_debug_name,
+                    ppsz_event_type_to_name[p_event->type],
+                    cached_listener->p_user_data );
+        free(cached_listener->psz_debug_name);
+#endif
+
+        cached_listener->pf_callback( p_event, cached_listener->p_user_data );
+        cached_listener++;
+    }
+    free( array_of_cached_listeners );
+
 }
 
 /**
  * Add a callback for an event.
  */
-int event_Attach( vlc_event_manager_t * p_event_manager,
-                  vlc_event_type_t event_type,
-                  vlc_event_callback_t pf_callback,
-                  void *p_user_data )
+int __vlc_event_attach( vlc_event_manager_t * p_em,
+                        vlc_event_type_t event_type,
+                        vlc_event_callback_t pf_callback,
+                        void *p_user_data,
+                        const char * psz_debug_name )
 {
     vlc_event_listeners_group_t * listeners_group;
     vlc_event_listener_t * listener;
     listener = malloc(sizeof(vlc_event_listener_t));
     if( !listener )
         return VLC_ENOMEM;
-    
     listener->p_user_data = p_user_data;
     listener->pf_callback = pf_callback;
-    
-    FOREACH_ARRAY( listeners_group, p_event_manager->listeners_groups )
+#ifdef DEBUG_EVENT
+    listener->psz_debug_name = strdup( psz_debug_name );
+#else
+    (void)psz_debug_name;
+#endif
+
+    vlc_mutex_lock( &p_em->object_lock );
+    FOREACH_ARRAY( listeners_group, p_em->listeners_groups )
         if( listeners_group->event_type == event_type )
         {
             ARRAY_APPEND( listeners_group->listeners, listener );
+#ifdef DEBUG_EVENT
+                msg_Dbg( p_em->p_parent_object,
+                    "Listening to '%s' event with '%s' (data %p)",
+                    ppsz_event_type_to_name[event_type],
+                    listener->psz_debug_name,
+                    listener->p_user_data );
+#endif
+            vlc_mutex_unlock( &p_em->object_lock );
             return VLC_SUCCESS;
         }
     FOREACH_END()
-    
+    vlc_mutex_unlock( &p_em->object_lock );
+
+    msg_Err( p_em->p_parent_object, "Can't attach to an object event manager event" );
     free(listener);
     return VLC_EGENERIC;
 }
@@ -169,14 +250,16 @@ int event_Attach( vlc_event_manager_t * p_event_manager,
 /**
  * Remove a callback for an event.
  */
-int event_Detach( vlc_event_manager_t *p_event_manager,
-                   vlc_event_type_t event_type,
-                   vlc_event_callback_t pf_callback,
-                   void *p_user_data )
+int vlc_event_detach( vlc_event_manager_t *p_em,
+                      vlc_event_type_t event_type,
+                      vlc_event_callback_t pf_callback,
+                      void *p_user_data )
 {
     vlc_event_listeners_group_t * listeners_group;
     struct vlc_event_listener_t * listener;
-    FOREACH_ARRAY( listeners_group, p_event_manager->listeners_groups )
+
+    vlc_mutex_lock( &p_em->object_lock );
+    FOREACH_ARRAY( listeners_group, p_em->listeners_groups )
         if( listeners_group->event_type == event_type )
         {
             FOREACH_ARRAY( listener, listeners_group->listeners )
@@ -184,17 +267,28 @@ int event_Detach( vlc_event_manager_t *p_event_manager,
                     listener->p_user_data == p_user_data )
                 {
                     /* that's our listener */
-                    free( listener );
                     ARRAY_REMOVE( listeners_group->listeners,
                         fe_idx /* This comes from the macro (and that's why
                                   I hate macro) */ );
+#ifdef DEBUG_EVENT
+                    msg_Dbg( p_em->p_parent_object,
+                        "Detaching '%s' from '%s' event (data %p)",
+                        listener->psz_debug_name,
+                        ppsz_event_type_to_name[event_type],
+                        listener->p_user_data );
+
+                    free( listener->psz_debug_name );
+#endif
+                    free( listener );
+                    vlc_mutex_unlock( &p_em->object_lock );
                     return VLC_SUCCESS;
                 }
             FOREACH_END()
         }
     FOREACH_END()
+    vlc_mutex_unlock( &p_em->object_lock );
+
+    msg_Warn( p_em->p_parent_object, "Can't detach to an object event manager event" );
 
     return VLC_EGENERIC;
 }
-
-