Changeset 24ddff58f6fb99cafff56a88d2fb99a5f687ff51

Timestamp:

26/03/08 17:36:07 (8 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1206549367 +0100

git-parent:

[5f84c2fc2138f2904321993f1d99772ae8648281]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1206548520 +0100

Message:

libvlc: Move input_item array from playlist to libvlc.

This avoids the circular dependency there is from playlist and input item, which creates a dead lock at exit.

Files:

• include/main.h (modified) (2 diffs)
• include/vlc_input.h (modified) (1 diff)
• include/vlc_playlist.h (modified) (3 diffs)
• src/input/item.c (modified) (4 diffs)
• src/libvlc-common.c (modified) (2 diffs)
• src/libvlc.sym (modified) (1 diff)
• src/playlist/engine.c (modified) (3 diffs)

include/main.h

@@ -27 +27 @@
-#endif
-
+TYPEDEF_ARRAY(input_item_t*, input_item_array_t);
+
-/*****************************************************************************
- * libvlc_internal_instance_t
@@ -47 +49 @@
-
-    vlc_object_t          *p_interaction;       ///< interface interaction object
+
+    /* There is no real reason to keep a list of items, but not to break
+     * everything, let's keep it */
+    input_item_array_t    input_items;       ///< Array of all created input items
+    int                   i_last_input_id ;  ///< Last id of input item
-
-    /* Messages */

include/vlc_input.h

@@ -383 +383 @@
-VLC_EXPORT( input_item_t *, input_ItemNewWithType, ( vlc_object_t *, const char *, const char *e, int, const char *const *, mtime_t i_duration, int ) );
-
-
+
+
-
-/*****************************************************************************

include/vlc_playlist.h

@@ -40 +40 @@
-
-TYPEDEF_ARRAY(playlist_item_t*, playlist_item_array_t);
-TYPEDEF_ARRAY(input_item_t*, input_item_array_t);
-
-/**
@@ -177 +176 @@
-    playlist_item_array_t all_items; /**< Array of items and nodes */
-
-    input_item_array_t    input_items; /**< Array of input items */
-
-    playlist_item_array_t current; /**< Items currently being played */
-    int                   i_current_index; /**< Index in current array */
@@ -186 +183 @@
-
-    int                   i_last_playlist_id; /**< Last id to an item */
-    int                   i_last_input_id ; /**< Last id on an input */
-
-    /* Predefined items */

src/input/item.c

@@ -105 +105 @@
-    int i;
-
-    playlist_t *p_playlist = pl_Yield( p_obj );
-    input_ItemClean( p_input );
-
-
+
+
+
-    if( i != -1 )
-
-
-
+
+
+
+
-    free( p_input );
-}
@@ -216 +218 @@
-}
-
-
-
+
+
+
-    int i;
-
+
+
+
+
-    if( i != -1 )
-
-
+
+
+
+
+
-}
-
@@ -244 +253 @@
-                                int i_type )
-{
-    playlist_t *p_playlist = pl_Yield( p_obj );
-    DECMALLOC_NULL( p_input, input_item_t );
-
@@ -250 +258 @@
-    vlc_gc_init( p_input, input_ItemDestroy, (void *)p_obj );
-
-
-
-
-
-
+
+
+
+
-
-    p_input->b_fixed_name = VLC_FALSE;

src/libvlc-common.c

@@ -727 +727 @@
-    p_libvlc->pp_timers = NULL;
-
+    /* Init the array that holds every input item */
+    ARRAY_INIT( p_libvlc->input_items );
+    p_libvlc->i_last_input_id = 0;
+
-    /*
-     * Initialize hotkey handling
@@ -967 +971 @@
-        announce_HandlerDestroy( p_announce );
-    }
+
+    msg_Dbg( p_libvlc, "removing remaining input items" );
+    FOREACH_ARRAY( input_item_t *p_del, p_libvlc->input_items )
+        msg_Dbg( p_libvlc, "WARNING: %p input item has not been deleted properly", p_del );
+        input_ItemClean( p_del );
+        free( p_del );
+    FOREACH_END();
+    ARRAY_RESET( p_libvlc->input_items );
+
-    return VLC_SUCCESS;
-}

src/libvlc.sym

@@ -131 +131 @@
-input_ItemAddInfo
-input_ItemAddOpt
-
+__
-input_ItemGetInfo
-__input_ItemNewExt

src/playlist/engine.c

@@ -81 +81 @@
-    vlc_mutex_init( p_playlist, &p_playlist->gc_lock );
-    p_playlist->i_last_playlist_id = 0;
-    p_playlist->i_last_input_id = 0;
-    p_playlist->p_input = NULL;
-
@@ -89 +88 @@
-    ARRAY_INIT( p_playlist->items );
-    ARRAY_INIT( p_playlist->all_items );
-    ARRAY_INIT( p_playlist->input_items );
-    ARRAY_INIT( p_playlist->current );
-
@@ -492 +490 @@
-    FOREACH_END();
-    ARRAY_RESET( p_playlist->all_items );
-
-    FOREACH_ARRAY( input_item_t *p_del, p_playlist->input_items )
-        input_ItemClean( p_del );
-        free( p_del );
-    FOREACH_END();
-    ARRAY_RESET( p_playlist->input_items );
-
-    ARRAY_RESET( p_playlist->items );