Changeset 5a989669c617078efd638d0a4edd3d51d929a349

Timestamp:

19/11/06 17:12:43 (2 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1163952763 +0000

git-parent:

[9fa2642c44cc79793530eda5ab44c03c6ab47d46]

git-author:

Clément Stenac <zorglub@videolan.org> 1163952763 +0000

Message:

Input options inheritance in directory access (Closes:#353)

Files:

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

modules/access/directory.c

@@ -126 +126 @@
-
-static int ReadDir( playlist_t *, const char *psz_name, int i_mode,
-
+, input_item_t *
-
-/*****************************************************************************
@@ -185 +185 @@
-    input_item_t       *p_current_input = ( (input_thread_t*)p_access->p_parent)
-                                                       ->input.p_item;
-
-
+
+
+
-    char               *psz_name = strdup (p_access->psz_path);
-
@@ -222 +223 @@
-
-    p_current->p_input->i_type = ITEM_TYPE_DIRECTORY;
-
+
+
-
-    i_activity = var_GetInteger( p_playlist, "activity" );
@@ -228 +230 @@
-                    DIRECTORY_ACTIVITY );
-
-
+
+
-
-    i_activity = var_GetInteger( p_playlist, "activity" );
@@ -330 +333 @@
-static int ReadDir( playlist_t *p_playlist, const char *psz_name,
-                    int i_mode, playlist_item_t *p_parent,
-
+
+
-{
-    char **pp_dir_content = NULL;
@@ -435 +439 @@
-                     * Else, we still don't have  */
-                    if( ReadDir( p_playlist, psz_uri , MODE_EXPAND,
-
+
+
-                          != VLC_SUCCESS )
-                    {
@@ -470 +475 @@
-                                                 -1, ITEM_TYPE_VFILE );
-                if (p_input != NULL)
+                {
+                    if( p_current_input )
+                        input_ItemCopyOptions( p_current_input, p_input );
-                    playlist_BothAddInput( p_playlist, p_input,
-                                           p_parent_category,
-                                           PLAYLIST_APPEND|PLAYLIST_PREPARSE,
-                                           PLAYLIST_END, NULL, NULL );
+                }
-            }
-        }