implemented the display device selector.

[vlc] / src / control / event.c

diff --git a/src/control/event.c b/src/control/event.c
index 4d99b72f6b4967c6c08e673c29646c378574592b..cf5999c0a9172bec073a4008c9161c545cf43828 100644 (file)
--- a/src/control/event.c
+++ b/src/control/event.c
@@ -31,6 +31,28 @@
  * Private functions
  */
 
+static vlc_bool_t
+listeners_are_equal( libvlc_event_listener_t * listener1,
+                     libvlc_event_listener_t * listener2 )
+{
+    return listener1->event_type  == listener2->event_type &&
+           listener1->pf_callback == listener2->pf_callback &&
+           listener1->p_user_data == listener2->p_user_data;
+}
+
+static vlc_bool_t
+group_contains_listener( libvlc_event_listeners_group_t * group,
+                         libvlc_event_listener_t * searched_listener )
+{
+    int i;
+    for( i = 0; i < vlc_array_count(&group->listeners); i++ )
+    {
+        if( listeners_are_equal(searched_listener, vlc_array_item_at_index(&group->listeners, i)) )
+            return VLC_TRUE;
+    }
+    return VLC_FALSE;
+}
+
 /*
  * Internal libvlc functions
  */
@@ -79,7 +101,7 @@ libvlc_event_manager_new( void * p_obj, libvlc_instance_t * p_libvlc_inst,
     libvlc_retain( p_libvlc_inst );
     vlc_array_init( &p_em->listeners_groups );
     vlc_mutex_init( p_libvlc_inst->p_libvlc_int, &p_em->object_lock );
-    vlc_mutex_init( p_libvlc_inst->p_libvlc_int, &p_em->event_sending_lock );
+    vlc_mutex_init_recursive( p_libvlc_inst->p_libvlc_int, &p_em->event_sending_lock );
     return p_em;
 }
 
@@ -145,7 +167,7 @@ void libvlc_event_manager_register_event_type(
 void libvlc_event_send( libvlc_event_manager_t * p_em,
                         libvlc_event_t * p_event )
 {
-    libvlc_event_listeners_group_t * listeners_group;
+    libvlc_event_listeners_group_t * listeners_group = NULL;
     libvlc_event_listener_t * listener_cached;
     libvlc_event_listener_t * listener;
     libvlc_event_listener_t * array_listeners_cached = NULL;
@@ -185,17 +207,33 @@ void libvlc_event_send( libvlc_event_manager_t * p_em,
         }
     }
 
+    if( !listeners_group )
+    {
+        free( array_listeners_cached );
+        return;
+    }
+
     vlc_mutex_unlock( &p_em->object_lock );
 
-    /* Here a read/write lock would be *especially* nice,
-     * We would be able to send event without blocking */
-    /* The only reason for this lock is to be able to wait the
-     * End of events sending with libvlc_event_manager_lock_event_sending.
-     * This can be useful to make sure a callback is completely detached. */
     vlc_mutex_lock( &p_em->event_sending_lock );
     listener_cached = array_listeners_cached;
+    listeners_group->b_sublistener_removed = VLC_FALSE;
     for( i = 0; i < i_cached_listeners; i++ )
     {
+        if( listeners_group->b_sublistener_removed )
+        {
+            /* If a callback was removed, this gets called */
+            vlc_bool_t valid_listener;
+            vlc_mutex_lock( &p_em->object_lock );
+            valid_listener = group_contains_listener( listeners_group, listener_cached );
+            vlc_mutex_unlock( &p_em->object_lock );
+            if( !valid_listener )
+            {
+                listener_cached++;
+                continue;
+            }
+        }
+        
         listener_cached->pf_callback( p_event, listener_cached->p_user_data );
         listener_cached++;
     }
@@ -307,60 +345,46 @@ void libvlc_event_attach( libvlc_event_manager_t * p_event_manager,
  * Remove a callback for an event.
  **************************************************************************/
 void libvlc_event_detach( libvlc_event_manager_t *p_event_manager,
-                          libvlc_event_type_t event_type,
-                          libvlc_callback_t pf_callback,
-                          void *p_user_data,
-                          libvlc_exception_t *p_e )
-{
-    libvlc_event_detach_lock_state( p_event_manager, event_type, pf_callback,
-                                    p_user_data, libvlc_UnLocked, p_e );
-}
-
-/**************************************************************************
- *       libvlc_event_detach_no_lock (internal) :
- *
- * Remove a callback for an event.
- **************************************************************************/
-void libvlc_event_detach_lock_state( libvlc_event_manager_t *p_event_manager,
                                      libvlc_event_type_t event_type,
                                      libvlc_callback_t pf_callback,
                                      void *p_user_data,
-                                     libvlc_lock_state_t lockstate,
                                      libvlc_exception_t *p_e )
 {
     libvlc_event_listeners_group_t * listeners_group;
     libvlc_event_listener_t * listener;
-    int i;
+    int i, j;
 
-    if( lockstate == libvlc_UnLocked )
-        vlc_mutex_lock( &p_event_manager->event_sending_lock );
+    vlc_mutex_lock( &p_event_manager->event_sending_lock );
     vlc_mutex_lock( &p_event_manager->object_lock );
     for( i = 0; i < vlc_array_count(&p_event_manager->listeners_groups); i++)
     {
         listeners_group = vlc_array_item_at_index(&p_event_manager->listeners_groups, i);
         if( listeners_group->event_type == event_type )
         {
-            for( i = 0; i < vlc_array_count(&listeners_group->listeners); i++)
+            for( j = 0; j < vlc_array_count(&listeners_group->listeners); j++)
             {
-                listener = vlc_array_item_at_index(&listeners_group->listeners, i);
+                listener = vlc_array_item_at_index(&listeners_group->listeners, j);
                 if( listener->event_type == event_type &&
                     listener->pf_callback == pf_callback &&
                     listener->p_user_data == p_user_data )
                 {
                     /* that's our listener */
+                    
+                    /* Mark this group as edited so that libvlc_event_send
+                     * will recheck what listener to call */
+                    listeners_group->b_sublistener_removed = VLC_FALSE;
+
                     free( listener );
-                    vlc_array_remove( &listeners_group->listeners, i );
+                    vlc_array_remove( &listeners_group->listeners, j );
                     vlc_mutex_unlock( &p_event_manager->object_lock );
-                    if( lockstate == libvlc_UnLocked )
-                        vlc_mutex_unlock( &p_event_manager->event_sending_lock );
+                    vlc_mutex_unlock( &p_event_manager->event_sending_lock );
                     return;
                 }
             }
         }
     }
     vlc_mutex_unlock( &p_event_manager->object_lock );
-    if( lockstate == libvlc_UnLocked )
-        vlc_mutex_unlock( &p_event_manager->event_sending_lock );
+    vlc_mutex_unlock( &p_event_manager->event_sending_lock );
 
     libvlc_exception_raise( p_e,
             "This object event manager doesn't know about '%s,%p,%p' event observer",