* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
+#include <vlc_plugin.h>
#include <vlc_playlist.h>
#include <vlc_input.h>
#include <vlc_access.h>
#include <vlc_demux.h>
-#include <stdlib.h>
-#include <string.h>
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
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 );
- add_shortcut( "directory" );
+ set_capability( "demux", 0 );
set_callbacks( DemuxOpen, NULL );
vlc_module_end();
typedef struct stat_list_t stat_list_t;
-static int Read( access_t *, uint8_t *, int );
-static int ReadNull( access_t *, uint8_t *, int );
+static ssize_t Read( access_t *, uint8_t *, size_t );
+static ssize_t ReadNull( access_t *, uint8_t *, size_t );
static int Control( access_t *, int, va_list );
static int Demux( demux_t *p_demux );
{
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;
/*****************************************************************************
* ReadNull: read the directory
*****************************************************************************/
-static int ReadNull( access_t *p_access, uint8_t *p_buffer, int i_len)
+static ssize_t ReadNull( access_t *p_access, uint8_t *p_buffer, size_t i_len)
{
/* Return fake data */
memset( p_buffer, 0, i_len );
/*****************************************************************************
* Read: read the directory
*****************************************************************************/
-static int Read( access_t *p_access, uint8_t *p_buffer, int 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;
return VLC_ENOMEM;
playlist_t *p_playlist = pl_Yield( p_access );
+ input_thread_t *p_input = (input_thread_t*)vlc_object_find( p_access, VLC_OBJECT_INPUT, FIND_PARENT );
+
playlist_item_t *p_item_in_category;
- input_item_t *p_current_input = input_GetItem(
- (input_thread_t*)p_access->p_parent);
- playlist_item_t *p_current = playlist_ItemGetByInput( p_playlist,
- p_current_input,
- VLC_FALSE );
+ input_item_t *p_current_input;
+ playlist_item_t *p_current;
- if( p_current == NULL )
+ if( !p_input )
+ {
+ msg_Err( p_access, "unable to find input (internal error)" );
+ vlc_object_release( p_playlist );
+ return VLC_ENOOBJ;
+ }
+
+ p_current_input = input_GetItem( p_input );
+ p_current = playlist_ItemGetByInput( p_playlist, p_current_input, false );
+
+ if( !p_current )
{
msg_Err( p_access, "unable to find item in playlist" );
+ vlc_object_release( p_input );
vlc_object_release( p_playlist );
return VLC_ENOOBJ;
}
/* Remove the ending '/' char */
- if (psz_name[0])
+ if( psz_name[0] )
{
char *ptr = psz_name + strlen (psz_name);
switch (*--ptr)
p_current->p_input->i_type = ITEM_TYPE_DIRECTORY;
p_item_in_category = playlist_ItemToNode( p_playlist, p_current,
- VLC_FALSE );
+ false );
i_activity = var_GetInteger( p_playlist, "activity" );
var_SetInteger( p_playlist, "activity", i_activity +
playlist_Signal( p_playlist );
- if( psz_name ) free( psz_name );
+ free( psz_name );
+ vlc_object_release( p_input );
vlc_object_release( p_playlist );
/* Return fake data forever */
p_access->pf_read = ReadNull;
- return ReadNull( p_access, p_buffer, i_len );
+ return -1;
}
/*****************************************************************************
- * DemuxOpen:
+ * Control:
*****************************************************************************/
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;
/* */
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
+ case ACCESS_GET_CONTENT_TYPE:
return VLC_EGENERIC;
default:
*****************************************************************************/
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 );
}
char *psz_ignore;
struct stat_list_t stself;
+#ifndef WIN32
int fd = dirfd (handle);
if ((fd == -1) || fstat (fd, &stself.st))
{
- msg_Err (p_playlist, "cannot stat `%s': %s", psz_name,
- strerror (errno));
+ msg_Err (p_playlist, "cannot stat `%s': %m", psz_name);
return VLC_EGENERIC;
}
for (stat_list_t *stats = stparent; stats != NULL; stats = stats->parent)
{
-#ifndef WIN32
if ((stself.st.st_ino == stats->st.st_ino)
&& (stself.st.st_dev == stats->st.st_dev))
{
psz_name);
return VLC_SUCCESS;
}
+ }
#else
/* Windows has st_dev (driver letter - 'A'), but it zeroes st_ino,
- * so that the test above will always incorrectly succeed. */
+ * so that the test above will always incorrectly succeed.
+ * Besides, Windows does not have dirfd(). */
#endif
- }
stself.parent = stparent;
i_dir_content = utf8_loaddir (handle, &pp_dir_content, NULL, Sort);
if( i_dir_content == -1 )
{
- msg_Err (p_playlist, "cannot read `%s': %s", psz_name,
- strerror (errno));
+ msg_Err (p_playlist, "cannot read `%s': %m", psz_name);
return VLC_EGENERIC;
}
else if( i_dir_content <= 0 )
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++ )
p_node = playlist_NodeCreate( p_playlist, entry,
p_parent_category,
- PLAYLIST_NO_REBUILD );
+ PLAYLIST_NO_REBUILD, NULL );
/* If we had the parent in category, the it is now node.
* Else, we still don't have */
memcpy (psz_uri, "file://", 7);
p_input = input_ItemNewWithType( VLC_OBJECT(p_playlist),
psz_uri, entry, 0, NULL,
- -1, ITEM_TYPE_VFILE );
+ -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 );
+ PLAYLIST_END, NULL, NULL,
+ false );
+ 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;
}
{
int err = errno;
if (err != ENOTDIR)
- msg_Err (obj, "%s: %s", path, strerror (err));
+ msg_Err (obj, "%s: %m", path);
else
msg_Dbg (obj, "skipping non-directory `%s'", path);
errno = err;
projects / vlc / blobdiff