Changeset a9a5e4830a6b6c2db67eb9db6c3addec74afbf75

Timestamp:

14/07/08 00:00:25 (5 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1215986425 +0200

git-parent:

[1fac4d77a9b862ec150ade10173015a96986c608]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1215986425 +0200

Message:

directory: Don't get stuck if playlist dies. And remove an unused param.

Files:

• modules/access/directory.c (modified) (7 diffs)

modules/access/directory.c

@@ -137 +137 @@
-
-static int ReadDir( playlist_t *, const char *psz_name, int i_mode,
-playlist_item_t *, 
+
-                    DIR *handle, stat_list_t *stats );
-
@@ -257 +257 @@
-                                              false );
-
-current, p_
+
-             p_current_input, (DIR *)p_access->p_sys, NULL );
-
@@ -366 +366 @@
- *****************************************************************************/
-static int ReadDir( playlist_t *p_playlist, const char *psz_name,
- playlist_item_t *p_parent,
+
-                    playlist_item_t *p_parent_category,
-                    input_item_t *p_current_input,
@@ -374 +374 @@
-    int             i_dir_content, i, i_return = VLC_SUCCESS;
-    playlist_item_t *p_node;
+
+    if( !vlc_object_alive( p_playlist ) )
+        return VLC_SUCCESS;
-
-    char **ppsz_extensions = NULL;
@@ -488 +491 @@
-                 * Else, we still don't have  */
-                i_return = ReadDir( p_playlist, psz_uri , MODE_EXPAND,
-node, p_
+
-                                    p_current_input, subdir, &stself );
-                closedir (subdir);
@@ -519 +522 @@
-                memmove (psz_uri + 7, psz_uri, sizeof (psz_uri) - 7);
-                memcpy (psz_uri, "file://", 7);
-VLC_OBJECT(p_playlist)
+p_playlist
-                                                 psz_uri, entry, 0, NULL,
-                                                 -1, ITEM_TYPE_FILE );
+                msg_Dbg( p_playlist, "dir: created %s", p_input->psz_name );
-                if (p_input != NULL)
-                {
@@ -532 +536 @@
-                                           PLAYLIST_END, NULL, NULL,
-                                           false );
+                    msg_Dbg( p_playlist, "dir: Deleting %s", p_input->psz_name );
-                    vlc_gc_decref( p_input );
-                    if( i_ret != VLC_SUCCESS )