Changeset f452c11004a9eddf5fa3c9342b44590c936018a1

Timestamp:

10/18/07 17:34:01 (11 months ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1192721641 +0000

git-parent:

[fbce9b9638ce65acc8c4c8bb1c9d7405d4378bc8]

git-author:

Rafaël Carré <funman@videolan.org> 1192721641 +0000

Message:

playlist_CreateNode(): add an argument to specify an input_item_t to be linked with the node, rather than creating a new input.
Setting that argument to NULL will make playlist_CreateNode() behave like previously.

That way we can create only one input per pair of node (for local playlist, media library, and service discovery)
Previous behaviour was to create 2 inputs with the same i_id member, but we would store both input in a binary search tree (sorted by i_id), and that kind of tree MUST NOT have 2 items with the same key, else we will get some bad memory corruption when the wrong input is removed from the tree (the other being left in the tree while the memory referred by it was freed).
Note that this breaks ABI

Files:

• include/vlc_playlist.h (modified) (1 diff)
• modules/access/directory.c (modified) (1 diff)
• modules/gui/macosx/playlist.m (modified) (1 diff)
• modules/gui/wxwidgets/dialogs/playlist.cpp (modified) (1 diff)
• modules/services_discovery/upnp_cc.cpp (modified) (2 diffs)
• modules/services_discovery/upnp_intel.cpp (modified) (2 diffs)
• src/playlist/engine.c (modified) (4 diffs)
• src/playlist/services_discovery.c (modified) (1 diff)
• src/playlist/tree.c (modified) (3 diffs)

include/vlc_playlist.h

@@ -392 +392 @@
-
-/* Node management */
-
+, input_item_t *
-VLC_EXPORT( int, playlist_NodeAppend, (playlist_t *,playlist_item_t*,playlist_item_t *) );
-VLC_EXPORT( int, playlist_NodeInsert, (playlist_t *,playlist_item_t*,playlist_item_t *, int) );

modules/access/directory.c

@@ -477 +477 @@
-                p_node = playlist_NodeCreate( p_playlist, entry,
-                                              p_parent_category,
-
+, NULL
-
-                /* If we had the parent in category, the it is now node.

modules/gui/macosx/playlist.m

@@ -1374 +1374 @@
-    if( psz_name != NULL && psz_name != "" )
-        p_item = playlist_NodeCreate( p_playlist, psz_name,
-      p_playlist->p_local_category, 0
+p_playlist->p_local_category, 0, NULL
-    else if(! config_GetInt( p_playlist, "interact" ) )
-    {
-        /* in case that the interaction is disabled, just give it a bogus name */
-        p_item = playlist_NodeCreate( p_playlist, _("Empty Folder"),
-      p_playlist->p_local_category, 0
+p_playlist->p_local_category, 0, NULL
-    }
-

modules/gui/wxwidgets/dialogs/playlist.cpp

@@ -1606 +1606 @@
-    p_item = playlist_ItemGetById( p_playlist, p_wxitem->i_id, VLC_TRUE );
-
-
+, NULL
-
-    UnlockPlaylist( p_intf->p_sys, p_playlist );

modules/services_discovery/upnp_cc.cpp

@@ -181 +181 @@
-    char *str = strdup( dev->getFriendlyName( ) );
-
-0
+ 0, NULL
-    p_item->i_flags &= ~PLAYLIST_SKIP_FLAG;
-    msg_Dbg( p_sd, "device %s added", str );
@@ -222 +222 @@
-
-        char* p_name = strdup(title); /* See other comment on strdup */
-
-name, p_parent, 0
+ p_name,
+parent, 0, NULL
-        free(p_name);
-

modules/services_discovery/upnp_intel.cpp

@@ -854 +854 @@
-
-        char* title = strdup( container->getTitle() );
-
+, NULL
-        free( title );
-
@@ -917 +917 @@
-    playlist_item_t* node = playlist_NodeCreate( pl_Get( _cookie->serviceDiscovery ),
-                                                 name,
-
+, NULL
-    free( name );
-    s->setPlaylistNode( node );

src/playlist/engine.c

@@ -101 +101 @@
-
-    p_playlist->p_root_category = playlist_NodeCreate( p_playlist, NULL, NULL,
-                   0
+0, NULL
-    p_playlist->p_root_onelevel = playlist_NodeCreate( p_playlist, NULL, NULL,
-                   0
+0, p_playlist->p_root_category->p_input
-
-    if( !p_playlist->p_root_category || !p_playlist->p_root_onelevel )
@@ -109 +109 @@
-
-    /* Create playlist and media library */
-_playlist->p_local_category = playlist_NodeCreate( p_playlist
-  _( "Playlist" ),p_playlist->p_root_category, 0 );
-p_playlist->p_local_onelevel =  playlist_NodeCreate( p_playlist,
-
+laylist_NodesPairCreate( p_playlist, _( "Playlist" )
+&p_playlist->p_local_category,
+                        &p_playlist->p_local_onelevel, VLC_FALSE );
+
-    p_playlist->p_local_category->i_flags |= PLAYLIST_RO_FLAG;
-    p_playlist->p_local_onelevel->i_flags |= PLAYLIST_RO_FLAG;
@@ -121 +121 @@
-        return NULL;
-
-    /* Link the nodes together. Todo: actually create them from the same input*/
-    p_playlist->p_local_onelevel->p_input->i_id =
-        p_playlist->p_local_category->p_input->i_id;
-
-    if( config_GetInt( p_playlist, "media-library") )
-    {
-
-
-
-
+
+
+
-
-        if(!p_playlist->p_ml_category || !p_playlist->p_ml_onelevel)
@@ -137 +132 @@
-        p_playlist->p_ml_category->i_flags |= PLAYLIST_RO_FLAG;
-        p_playlist->p_ml_onelevel->i_flags |= PLAYLIST_RO_FLAG;
-        p_playlist->p_ml_onelevel->p_input->i_id =
-             p_playlist->p_ml_category->p_input->i_id;
-
-    }
-    else

src/playlist/services_discovery.c

@@ -208 +208 @@
-        {
-            p_cat = playlist_NodeCreate( p_parent->p_playlist, psz_cat,
-
+, NULL
-            p_cat->i_flags &= ~PLAYLIST_SKIP_FLAG;
-        }

src/playlist/tree.c

@@ -48 +48 @@
- * \param p_parent the parent node to attach to or NULL if no attach
- * \param p_flags miscellaneous flags
+ * \param p_input the input_item to attach to or NULL if it has to be created
- * \return the new node
- */
-playlist_item_t * playlist_NodeCreate( playlist_t *p_playlist,
-                                       const char *psz_name,
-
-
-
+
+
+
+
-    playlist_item_t *p_item;
-
-    if( !psz_name ) psz_name = _("Undefined");
-
-
-
+
+
+
+
+
+
-
-    if( p_item == NULL )  return NULL;
@@ -280 +285 @@
-/**
- * Create a pair of nodes in the category and onelevel trees.
-
-
+
- * \param p_playlist the playlist
- * \param psz_name the name of the nodes
@@ -294 +298 @@
-{
-    *pp_node_cat = playlist_NodeCreate( p_playlist, psz_name,
-
+, NULL
-    *pp_node_one = playlist_NodeCreate( p_playlist, psz_name,
- );
-(*pp_node_one)->p_input->i_id = (*pp_node_cat)->p_input->i_id
+,
+                                    (*pp_node_cat)->p_input )
-    if( b_for_sd )
-    {