Changeset 48586f51f89bd34422d50520fffea10f0f1ba402

Timestamp:

24/08/07 16:02:11 (1 year ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

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

git-parent:

[9bd5dd03ed6b9fc925810faeb61a9558bbc85d99]

git-author:

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

Message:

media_list.c: Handle item addition and removal in the flat list. Also Get the media_list to init and release the flat media list.

Files:

• src/control/flat_media_list.c (modified) (6 diffs)
• src/control/libvlc_internal.h (modified) (1 diff)
• src/control/media_list.c (modified) (1 diff)

src/control/flat_media_list.c

@@ -31 +31 @@
- * Private functions
- */
+static void add_media_list( libvlc_media_list_t * p_mlist, libvlc_media_list_t * p_submlist );
+static void remove_media_list( libvlc_media_list_t * p_fmlist, libvlc_media_list_t * p_mlist );
-static void add_item( libvlc_media_list_t * p_mlist, libvlc_media_descriptor_t * p_md );
-static void remove_item( libvlc_media_list_t * p_mlist, libvlc_media_descriptor_t * p_md );
@@ -36 +38 @@
-static void sublist_item_added( const libvlc_event_t * p_event, void * p_user_data );
-static void sublist_item_removed( const libvlc_event_t * p_event, void * p_user_data );
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/**************************************************************************
@@ -57 +129 @@
-                                 libvlc_MediaDescriptorSubItemAdded,
-                                 subitems_created, p_mlist, NULL );
+            uninstall_flat_mlist_observer( p_mlist );
-            libvlc_media_list_add_media_descriptor( p_mlist->p_flat_mlist,
-                                                    p_md, NULL );
+            install_flat_mlist_observer( p_mlist );           
-        }
-    }
@@ -75 +149 @@
-                         subitems_created, p_mlist, NULL );
-    int i = libvlc_media_list_index_of_item( p_mlist->p_flat_mlist, p_md, NULL );
+    uninstall_flat_mlist_observer( p_mlist );
-    libvlc_media_list_remove_index( p_mlist->p_flat_mlist, i, NULL );
+    install_flat_mlist_observer( p_mlist );
-}
-
@@ -118 +194 @@
-
-/**************************************************************************
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    int count = libvlc_media_list_count( p_submlist, NULL );    
-    int i;
-    for( i = 0; i < count; i++ )
-    {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                         libvlc_MediaListItemAdded,
-sub
-detach( p
+flat_m
+attach( p_mlist->p_flat
-                         libvlc_MediaListItemDeleted,
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/*
@@ -183 +309 @@
-                                            p_e );
-        add_media_list( p_mlist->p_flat_mlist, p_mlist );
+        install_flat_mlist_observer( p_mlist );
-    }
-    libvlc_media_list_retain( p_mlist->p_flat_mlist );

src/control/libvlc_internal.h

@@ -247 +247 @@
-                        ( libvlc_media_descriptor_t * ) );
-
+/* Media List */
+VLC_EXPORT ( void, libvlc_media_list_flat_media_list_release,
+                        ( libvlc_media_list_t * ) );
+
-/* Events */
-VLC_EXPORT (void, libvlc_event_init, ( libvlc_instance_t *p_instance, libvlc_exception_t *p_e ) );

src/control/media_list.c

@@ -218 +218 @@
-
-    /* Handled in flat_media_list.c */
-
-
+
-
-    libvlc_event_manager_release( p_mlist->p_event_manager );