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 *, input_item_t *,
+static int ReadDir( access_t *, playlist_t *, const char *psz_name,
+ int i_mode, playlist_item_t *, input_item_t *,
DIR *handle, stat_list_t *stats );
static DIR *OpenDir (vlc_object_t *obj, const char *psz_name);
if( !p_input )
{
msg_Err( p_access, "unable to find input (internal error)" );
- vlc_object_release( p_playlist );
+ pl_Release( p_access );
return VLC_ENOOBJ;
}
p_current_input = input_GetItem( p_input );
- p_current = playlist_ItemGetByInput( p_playlist, p_current_input, false );
+ p_current = playlist_ItemGetByInput( p_playlist, p_current_input, pl_Unlocked );
if( !p_current )
{
msg_Err( p_access, "unable to find item in playlist" );
vlc_object_release( p_input );
- vlc_object_release( p_playlist );
+ pl_Release( p_playlist );
return VLC_ENOOBJ;
}
p_current->p_input->i_type = ITEM_TYPE_DIRECTORY;
p_item_in_category = playlist_ItemToNode( p_playlist, p_current,
- false );
+ pl_Unlocked );
- ReadDir( p_playlist, psz_name, i_mode, p_item_in_category,
+ ReadDir( p_access, p_playlist, psz_name, i_mode,
+ p_item_in_category,
p_current_input, (DIR *)p_access->p_sys, NULL );
playlist_Signal( p_playlist );
free( psz_name );
vlc_object_release( p_input );
- vlc_object_release( p_playlist );
+ pl_Release( p_access );
/* Return fake data forever */
p_access->pf_read = ReadNull;
/*****************************************************************************
* ReadDir: read a directory and add its content to the list
*****************************************************************************/
-static int ReadDir( playlist_t *p_playlist, const char *psz_name,
+static int ReadDir( access_t *p_access, playlist_t *p_playlist,
+ const char *psz_name,
int i_mode,
playlist_item_t *p_parent_category,
input_item_t *p_current_input,
int i_dir_content, i, i_return = VLC_SUCCESS;
playlist_item_t *p_node;
+ if( !vlc_object_alive( p_access ) )
+ return VLC_EGENERIC;
+
if( !vlc_object_alive( p_playlist ) )
return VLC_EGENERIC;
msg_Dbg (p_playlist, "creating subdirectory %s", psz_uri);
+ PL_LOCK;
p_node = playlist_NodeCreate( p_playlist, entry,
p_parent_category,
PLAYLIST_NO_REBUILD, NULL );
+ PL_UNLOCK;
/* 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,
+ i_return = ReadDir( p_access, p_playlist, psz_uri , MODE_EXPAND,
p_parent_category ? p_node : NULL,
p_current_input, subdir, &stself );
closedir (subdir);
p_input = input_ItemNewWithType( 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)
{
if( p_current_input )
PLAYLIST_APPEND|PLAYLIST_PREPARSE|
PLAYLIST_NO_REBUILD,
PLAYLIST_END, NULL, NULL,
- false );
- msg_Dbg( p_playlist, "dir: Deleting %s", p_input->psz_name );
+ pl_Unlocked );
vlc_gc_decref( p_input );
if( i_ret != VLC_SUCCESS )
return VLC_EGENERIC;