Changeset 7e436fa9470869077303878a5b655da1731236dc

Timestamp:

02/25/08 18:50:10 (6 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

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

git-parent:

[d68b821264ac7d5b93098271dd4aaf71fd1a3f41]

git-author:

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

Message:

control/event.c: Use vlc_array_t instead of the macros.

Files:

• src/control/event.c (modified) (12 diffs)

src/control/event.c

@@ -43 +43 @@
-void libvlc_event_init( libvlc_instance_t *p_instance, libvlc_exception_t *p_e )
-{
+    (void)p_instance;(void)p_e;
-    /* Will certainly be used to install libvlc_instance event */
-}
@@ -53 +54 @@
-void libvlc_event_fini( libvlc_instance_t *p_instance )
-{
+    (void)p_instance;
-}
-
@@ -76 +78 @@
-    p_em->p_libvlc_instance = p_libvlc_inst;
-    libvlc_retain( p_libvlc_inst );
-ARRAY_INIT( 
+vlc_array_init( &
-    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 );
@@ -89 +91 @@
-void libvlc_event_manager_release( libvlc_event_manager_t * p_em )
-{
-listeners_group
-libvlc_event_listener_t * listener
+p_lg
+int i,j 
-
-    vlc_mutex_destroy( &p_em->event_sending_lock );
-    vlc_mutex_destroy( &p_em->object_lock );
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    libvlc_release( p_em->p_libvlc_instance );
-    free( p_em );
@@ -127 +131 @@
-
-    listeners_group->event_type = event_type;
-ARRAY_INIT( 
+vlc_array_init( &
-
-    vlc_mutex_lock( &p_em->object_lock );
-ARRAY_APPEND( 
+vlc_array_append( &
-    vlc_mutex_unlock( &p_em->object_lock );
-}
@@ -154 +158 @@
-
-    vlc_mutex_lock( &p_em->object_lock );
-
+
+
+
-        if( listeners_group->event_type == p_event->type )
-        {
-listeners_group->listeners.i_size
+vlc_array_count( &listeners_group->listeners )
-                break;
-
-            /* Cache a copy of the listener to avoid locking issues */
-listeners_group->listeners.i_size
+vlc_array_count(&listeners_group->listeners)
-            array_listeners_cached = malloc(sizeof(libvlc_event_listener_t)*(i_cached_listeners));
-            if( !array_listeners_cached )
@@ -170 +176 @@
-
-            listener_cached = array_listeners_cached;
-
-
+
+
+
+
-                listener_cached++;
-FOREACH_END()
+}
-            break;
-        }
-FOREACH_END()
+}
-
-    vlc_mutex_unlock( &p_em->object_lock );
@@ -262 +270 @@
-    libvlc_event_listeners_group_t * listeners_group;
-    libvlc_event_listener_t * listener;
+    int i;
+
-    listener = malloc(sizeof(libvlc_event_listener_t));
-    if( !listener )
@@ -274 +284 @@
-
-    vlc_mutex_lock( &p_event_manager->object_lock );
-
+
+
+
-        if( listeners_group->event_type == listener->event_type )
-        {
-ARRAY_APPEND( 
+vlc_array_append( &
-            vlc_mutex_unlock( &p_event_manager->object_lock );
-            return;
-        }
-FOREACH_END()
+}
-    vlc_mutex_unlock( &p_event_manager->object_lock );
-
@@ -319 +331 @@
-    libvlc_event_listeners_group_t * listeners_group;
-    libvlc_event_listener_t * listener;
+    int i;
-
-    if( lockstate == libvlc_UnLocked )
-        vlc_mutex_lock( &p_event_manager->event_sending_lock );
-    vlc_mutex_lock( &p_event_manager->object_lock );
-
+
+
+
-        if( listeners_group->event_type == event_type )
-        {
-
+
+
+
-                if( listener->event_type == event_type &&
-                    listener->pf_callback == pf_callback &&
@@ -333 +350 @@
-                    /* that's our listener */
-                    free( listener );
-
-
-
+
-                    vlc_mutex_unlock( &p_event_manager->object_lock );
-                    if( lockstate == libvlc_UnLocked )
@@ -341 +356 @@
-                    return;
-                }
-FOREACH_END()
+}
-        }
-FOREACH_END()
+}
-    vlc_mutex_unlock( &p_event_manager->object_lock );
-    if( lockstate == libvlc_UnLocked )