Removes trailing spaces. Removes tabs.

[vlc] / src / misc / events.c

diff --git a/src/misc/events.c b/src/misc/events.c
index a477425c0f3406e9aa275533d0fe8cd80a09efba..6e056f7ff777880b57095e83b48164b23b8c948d 100644 (file)
--- a/src/misc/events.c
+++ b/src/misc/events.c
@@ -61,7 +61,7 @@ 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[] =
 {
     [vlc_InputItemMetaChanged]          = "vlc_InputItemMetaChanged",
     [vlc_InputItemSubItemAdded]         = "vlc_InputItemSubItemAdded",
@@ -71,7 +71,7 @@ static const char * ppsz_event_type_to_name[] =
 #endif
 
 /*****************************************************************************
- * 
+ *
  *****************************************************************************/
 
 /**
@@ -105,8 +105,10 @@ void vlc_event_manager_fini( vlc_event_manager_t * p_em )
         FOREACH_ARRAY( listener, listeners_group->listeners )
             free( listener );
         FOREACH_END()
+        ARRAY_RESET( listeners_group->listeners );
         free( listeners_group );
     FOREACH_END()
+    ARRAY_RESET( p_em->listeners_groups );
 }
 
 /**
@@ -124,7 +126,7 @@ int vlc_event_manager_register_event_type(
 
     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 );
@@ -140,8 +142,9 @@ void vlc_event_send( vlc_event_manager_t * p_em,
 {
     vlc_event_listeners_group_t * listeners_group;
     vlc_event_listener_t * listener;
-    vlc_event_callback_t func = NULL;
-    void * user_data = NULL;
+    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;
@@ -150,28 +153,52 @@ void vlc_event_send( vlc_event_manager_t * p_em,
     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 )
-                func = listener->pf_callback;
-                user_data = listener->p_user_data;
+                memcpy( cached_listener, listener, sizeof(vlc_event_listener_t));
 #ifdef DEBUG_EVENT
-                msg_Dbg( p_em->p_parent_object,
-                    "Calling '%s' with a '%s' event (data %p)",
-                    listener->psz_debug_name,
-                    ppsz_event_type_to_name[p_event->type],
-                    listener->p_user_data );
+                cached_listener->psz_debug_name = strdup(cached_listener->psz_debug_name);
 #endif
-                /* This is safe to do that because we are sure 
-                 * that there will be no object owned references
-                 * used after the lock. */
-                vlc_mutex_unlock( &p_em->object_lock );
-                func( p_event, user_data );
-                vlc_mutex_lock( &p_em->object_lock );
+                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 );
+
 }
 
 /**
@@ -188,7 +215,7 @@ int __vlc_event_attach( vlc_event_manager_t * p_em,
     listener = malloc(sizeof(vlc_event_listener_t));
     if( !listener )
         return VLC_ENOMEM;
-    
+ 
     listener->p_user_data = p_user_data;
     listener->pf_callback = pf_callback;
 #ifdef DEBUG_EVENT