directory: Remove unuseful debug message.

[vlc] / modules / access / directory.c

diff --git a/modules/access/directory.c b/modules/access/directory.c
index 9f351c4a71b0a3642f400b9ec66515d42fc19379..49051ddf4011c24a7653df2fe56de7a33d968313 100644 (file)
--- a/modules/access/directory.c
+++ b/modules/access/directory.c
@@ -136,7 +136,7 @@ static int DemuxControl( demux_t *p_demux, int i_query, va_list args );
 
 
 static int ReadDir( playlist_t *, const char *psz_name, int i_mode,
-                    playlist_item_t *, playlist_item_t *, input_item_t *,
+                    playlist_item_t *, input_item_t *,
                     DIR *handle, stat_list_t *stats );
 
 static DIR *OpenDir (vlc_object_t *obj, const char *psz_name);
@@ -199,7 +199,7 @@ static ssize_t ReadNull( access_t *p_access, uint8_t *p_buffer, size_t i_len)
 static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len)
 {
     char               *psz;
-    int                 i_mode, i_activity;
+    int                 i_mode;
     char               *psz_name = strdup (p_access->psz_path);
 
     if( psz_name == NULL )
@@ -256,17 +256,9 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len)
     p_item_in_category = playlist_ItemToNode( p_playlist, p_current,
                                               false );
 
-    i_activity = var_GetInteger( p_playlist, "activity" );
-    var_SetInteger( p_playlist, "activity", i_activity +
-                    DIRECTORY_ACTIVITY );
-
-    ReadDir( p_playlist, psz_name, i_mode, p_current, p_item_in_category,
+    ReadDir( p_playlist, psz_name, i_mode, p_item_in_category,
              p_current_input, (DIR *)p_access->p_sys, NULL );
 
-    i_activity = var_GetInteger( p_playlist, "activity" );
-    var_SetInteger( p_playlist, "activity", i_activity -
-                    DIRECTORY_ACTIVITY );
-
     playlist_Signal( p_playlist );
 
     free( psz_name );
@@ -373,7 +365,7 @@ struct stat_list_t
  * ReadDir: read a directory and add its content to the list
  *****************************************************************************/
 static int ReadDir( playlist_t *p_playlist, const char *psz_name,
-                    int i_mode, playlist_item_t *p_parent,
+                    int i_mode,
                     playlist_item_t *p_parent_category,
                     input_item_t *p_current_input,
                     DIR *handle, stat_list_t *stparent )
@@ -382,6 +374,9 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name,
     int             i_dir_content, i, i_return = VLC_SUCCESS;
     playlist_item_t *p_node;
 
+    if( !vlc_object_alive( p_playlist ) )
+        return VLC_EGENERIC;
+
     char **ppsz_extensions = NULL;
     int i_extensions = 0;
     char *psz_ignore;
@@ -495,7 +490,7 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name,
                 /* If we had the parent in category, the it is now node.
                  * Else, we still don't have  */
                 i_return = ReadDir( p_playlist, psz_uri , MODE_EXPAND,
-                                    p_node, p_parent_category ? p_node : NULL,
+                                    p_parent_category ? p_node : NULL,
                                     p_current_input, subdir, &stself );
                 closedir (subdir);
                 if (i_return)
@@ -526,7 +521,7 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name,
 
                 memmove (psz_uri + 7, psz_uri, sizeof (psz_uri) - 7);
                 memcpy (psz_uri, "file://", 7);
-                p_input = input_ItemNewWithType( VLC_OBJECT(p_playlist),
+                p_input = input_ItemNewWithType( p_playlist,
                                                  psz_uri, entry, 0, NULL,
                                                  -1, ITEM_TYPE_FILE );
                 if (p_input != NULL)