* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#warning playlist code must not be used here.
#include <vlc_playlist.h>
#include <vlc_input.h>
#include <vlc_access.h>
"collapse: subdirectories appear but are expanded on first play.\n" \
"expand: all subdirectories are expanded.\n" )
-static const char *psz_recursive_list[] = { "none", "collapse", "expand" };
-static const char *psz_recursive_list_text[] = { N_("none"), N_("collapse"),
- N_("expand") };
+static const char *const psz_recursive_list[] = { "none", "collapse", "expand" };
+static const char *const psz_recursive_list_text[] = {
+ N_("none"), N_("collapse"), N_("expand") };
#define IGNORE_TEXT N_("Ignored extensions")
#define IGNORE_LONGTEXT N_( \
vlc_module_begin();
set_category( CAT_INPUT );
- set_shortname( _("Directory" ) );
+ set_shortname( N_("Directory" ) );
set_subcategory( SUBCAT_INPUT_ACCESS );
- set_description( _("Standard filesystem directory input") );
- set_capability( "access2", 55 );
+ set_description( N_("Standard filesystem directory input") );
+ set_capability( "access", 55 );
add_shortcut( "directory" );
add_shortcut( "dir" );
add_shortcut( "file" );
add_string( "recursive", "expand" , NULL, RECURSIVE_TEXT,
- RECURSIVE_LONGTEXT, VLC_FALSE );
+ RECURSIVE_LONGTEXT, false );
change_string_list( psz_recursive_list, psz_recursive_list_text, 0 );
add_string( "ignore-filetypes", "m3u,db,nfo,jpg,gif,sfv,txt,sub,idx,srt,cue",
- NULL, IGNORE_TEXT, IGNORE_LONGTEXT, VLC_FALSE );
+ NULL, IGNORE_TEXT, IGNORE_LONGTEXT, false );
set_callbacks( Open, Close );
add_submodule();
set_description( "Directory EOF");
- set_capability( "demux2", 0 );
+ set_capability( "demux", 0 );
set_callbacks( DemuxOpen, NULL );
vlc_module_end();
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 *,
+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);
{
access_t *p_access = (access_t*)p_this;
+ if( !p_access->psz_path )
+ return VLC_EGENERIC;
+
+ struct stat st;
+ if( !stat( p_access->psz_path, &st ) && !S_ISDIR( st.st_mode ) )
+ return VLC_EGENERIC;
+
DIR *handle = OpenDir (p_this, p_access->psz_path);
if (handle == NULL)
return VLC_EGENERIC;
p_access->pf_control= Control;
/* Force a demux */
+ free( p_access->psz_demux );
p_access->psz_demux = strdup( "directory" );
return VLC_SUCCESS;
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 )
}
p_current_input = input_GetItem( p_input );
- p_current = playlist_ItemGetByInput( p_playlist, p_current_input, VLC_FALSE );
+ p_current = playlist_ItemGetByInput( p_playlist, p_current_input, pl_Unlocked );
if( !p_current )
{
p_current->p_input->i_type = ITEM_TYPE_DIRECTORY;
p_item_in_category = playlist_ItemToNode( p_playlist, p_current,
- VLC_FALSE );
+ pl_Unlocked );
- 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_access, 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 );
- if( psz_name ) free( psz_name );
+ free( psz_name );
vlc_object_release( p_input );
vlc_object_release( p_playlist );
*****************************************************************************/
static int Control( access_t *p_access, int i_query, va_list args )
{
- vlc_bool_t *pb_bool;
+ bool *pb_bool;
int *pi_int;
int64_t *pi_64;
case ACCESS_CAN_FASTSEEK:
case ACCESS_CAN_PAUSE:
case ACCESS_CAN_CONTROL_PACE:
- pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
- *pb_bool = VLC_FALSE; /* FIXME */
+ pb_bool = (bool*)va_arg( args, bool* );
+ *pb_bool = false; /* FIXME */
break;
/* */
*****************************************************************************/
static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
{
- return demux2_vaControlHelper( p_demux->s, 0, 0, 0, 1, i_query, args );
+ return demux_vaControlHelper( p_demux->s, 0, 0, 0, 1, i_query, args );
}
/*****************************************************************************
* 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,
+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,
DIR *handle, stat_list_t *stparent )
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;
+
char **ppsz_extensions = NULL;
int i_extensions = 0;
char *psz_ignore;
psz_parser = ptr + 1;
}
}
- if( psz_ignore ) free( psz_ignore );
+ free( psz_ignore );
/* While we still have entries in the directory */
for( i = 0; i < i_dir_content; i++ )
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,
- p_node, p_parent_category ? p_node : NULL,
+ i_return = ReadDir( p_access, p_playlist, psz_uri , MODE_EXPAND,
+ p_parent_category ? p_node : NULL,
p_current_input, subdir, &stself );
closedir (subdir);
if (i_return)
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)
{
if( p_current_input )
input_ItemCopyOptions( p_current_input, p_input );
- playlist_BothAddInput( p_playlist, p_input,
+ int i_ret = playlist_BothAddInput( p_playlist, p_input,
p_parent_category,
PLAYLIST_APPEND|PLAYLIST_PREPARSE|
PLAYLIST_NO_REBUILD,
PLAYLIST_END, NULL, NULL,
- VLC_FALSE );
+ pl_Unlocked );
vlc_gc_decref( p_input );
+ if( i_ret != VLC_SUCCESS )
+ return VLC_EGENERIC;
}
}
}
}
for( i = 0; i < i_extensions; i++ )
- if( ppsz_extensions[i] ) free( ppsz_extensions[i] );
- if( ppsz_extensions ) free( ppsz_extensions );
+ free( ppsz_extensions[i] );
+ free( ppsz_extensions );
for( i = 0; i < i_dir_content; i++ )
- if( pp_dir_content[i] ) free( pp_dir_content[i] );
- if( pp_dir_content ) free( pp_dir_content );
+ free( pp_dir_content[i] );
+ free( pp_dir_content );
return i_return;
}
projects / vlc / blobdiff