X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdirectory.c;h=2834da7536d3e92dadad843fd366af577e8fd72a;hb=6ce6dc06545e12f9f04c6afe60c99e06fdc71502;hp=f799f041ba485e3bf6bd0dfce20fc9727a4d508c;hpb=806cf5165824be921bf2402ecf11fd3ee6501f9c;p=vlc diff --git a/modules/access/directory.c b/modules/access/directory.c index f799f041ba..2834da7536 100644 --- a/modules/access/directory.c +++ b/modules/access/directory.c @@ -26,7 +26,13 @@ * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#warning playlist code must not be used here. #include #include #include @@ -74,9 +80,9 @@ static int DemuxOpen ( vlc_object_t * ); "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_( \ @@ -87,28 +93,23 @@ static const char *psz_recursive_list_text[] = { N_("none"), N_("collapse"), 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 ); - change_string_list( psz_recursive_list, psz_recursive_list_text, 0 ); - change_safe(); - + 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 ); - change_safe(); - + 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(); @@ -147,6 +148,13 @@ static int Open( vlc_object_t *p_this ) { 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; @@ -159,6 +167,7 @@ static int Open( vlc_object_t *p_this ) p_access->pf_control= Control; /* Force a demux */ + free( p_access->psz_demux ); p_access->psz_demux = strdup( "directory" ); return VLC_SUCCESS; @@ -190,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 ) @@ -211,7 +220,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len) } 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, false ); if( !p_current ) { @@ -245,22 +254,14 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len) p_current->p_input->i_type = ITEM_TYPE_DIRECTORY; p_item_in_category = playlist_ItemToNode( p_playlist, p_current, - VLC_FALSE ); - - i_activity = var_GetInteger( p_playlist, "activity" ); - var_SetInteger( p_playlist, "activity", i_activity + - DIRECTORY_ACTIVITY ); + false ); ReadDir( p_playlist, psz_name, i_mode, p_current, 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 ); @@ -274,7 +275,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len) *****************************************************************************/ 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; @@ -285,8 +286,8 @@ static int Control( access_t *p_access, int i_query, va_list args ) 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; /* */ @@ -344,7 +345,7 @@ static int Demux( demux_t *p_demux ) *****************************************************************************/ 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 ); } @@ -449,7 +450,7 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name, 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++ ) @@ -524,25 +525,27 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name, { 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 ); + 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; }