Changeset 5f9f9ea47f81cfa7350e2930495602cc1137b2d7

Timestamp:

17/08/07 04:15:59 (1 year ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1187316959 +0000

git-parent:

[6e3263c3d6fe0e9bfed279f8e10fca0d20df10a6]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1187316959 +0000

Message:

misc/events.c: Avoid a couple of warning and move the calling back out of the lock.

Files:

• src/misc/events.c (modified) (11 diffs)

src/misc/events.c

@@ -65 +65 @@
-/**
- * Initialize event manager object
-this
+obj
- * necessarily a vlc_object_t (an input_item_t is not a vlc_object_t
- * for instance).
-
-
+
+
+
+
-{
-    p_em->p_obj = p_obj;
+    vlc_mutex_init( p_parent_obj, &p_em->object_lock );
-    ARRAY_INIT( p_em->listeners_groups );
-    return VLC_SUCCESS;
@@ -83 +86 @@
-    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 )
@@ -107 +112 @@
-    listeners_group->event_type = event_type;
-    ARRAY_INIT( listeners_group->listeners );
-
+
+
-    ARRAY_APPEND( p_em->listeners_groups, listeners_group );
+    vlc_mutex_unlock( &p_em->object_lock );
-
-    return VLC_SUCCESS;
@@ -121 +128 @@
-    vlc_event_listeners_group_t * listeners_group;
-    vlc_event_listener_t * listener;
+    vlc_event_callback_t func;
+    void * user_data;
-
-    /* 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 )
@@ -130 +140 @@
-            /* We found the group, now send every one the event */
-            FOREACH_ARRAY( listener, listeners_group->listeners )
-
+
+
-            FOREACH_END()
-            break;
-        }
-    FOREACH_END()
+    vlc_mutex_unlock( &p_em->object_lock );
+    
+    func( p_event, user_data );
-}
-
@@ -140 +154 @@
- * Add a callback for an event.
- */
-vent_manager
+m
-                      vlc_event_type_t event_type,
-                      vlc_event_callback_t pf_callback,
@@ -153 +167 @@
-    listener->p_user_data = p_user_data;
-    listener->pf_callback = pf_callback;
-
-
+
+
+
-        if( listeners_group->event_type == event_type )
-        {
-            ARRAY_APPEND( listeners_group->listeners, listener );
+            vlc_mutex_unlock( &p_em->object_lock );
-            return VLC_SUCCESS;
-        }
-    FOREACH_END()
-
+
+
-    free(listener);
-    return VLC_EGENERIC;
@@ -169 +186 @@
- * Remove a callback for an event.
- */
-vent_manager
+m
-                      vlc_event_type_t event_type,
-                      vlc_event_callback_t pf_callback,
@@ -176 +193 @@
-    vlc_event_listeners_group_t * listeners_group;
-    struct vlc_event_listener_t * listener;
-
+
+
+
-        if( listeners_group->event_type == event_type )
-        {
@@ -184 +203 @@
-                {
-                    /* 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) */ );
+                    free( listener );
+                    vlc_mutex_unlock( &p_em->object_lock );
-                    return VLC_SUCCESS;
-                }
@@ -193 +213 @@
-        }
-    FOREACH_END()
+    vlc_mutex_unlock( &p_em->object_lock );
-
-    return VLC_EGENERIC;