Changeset 45f5d65544760ed4147bfad8cda66b29da39207f

Timestamp:

29/02/08 20:09:17 (7 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

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

git-parent:

[478c793817a11dab66c865e322555517bacd3fd4]

git-author:

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

Message:

control/event.c: Remove libvlc_event_detach_lock_state().

Files:

• src/control/event.c (modified) (4 diffs)
• src/control/libvlc_internal.h (modified) (1 diff)

src/control/event.c

@@ -346 +346 @@
- **************************************************************************/
-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 )
-{
@@ -371 +355 @@
-    int i, j;
-
-
-
+
-    vlc_mutex_lock( &p_event_manager->object_lock );
-    for( i = 0; i < vlc_array_count(&p_event_manager->listeners_groups); i++)
@@ -387 +370 @@
-                {
-                    /* 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, j );
-                    vlc_mutex_unlock( &p_event_manager->object_lock );
-
-
+
-                    return;
-                }
@@ -398 +385 @@
-    }
-    vlc_mutex_unlock( &p_event_manager->object_lock );
-
-
+
-
-    libvlc_exception_raise( p_e,

src/control/libvlc_internal.h

@@ -359 +359 @@
-
-VLC_EXPORT (void, libvlc_event_manager_register_event_type, ( libvlc_event_manager_t * p_em, libvlc_event_type_t event_type, libvlc_exception_t * p_e ) );
-VLC_EXPORT (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 ) );
-
-VLC_EXPORT (void, libvlc_event_send, ( libvlc_event_manager_t * p_em, libvlc_event_t * p_event ) );