[vlc-devel] [PATCH 10/10] Remove the unsupported recursive browsing options from modules/access/fs.c

[Rémi Denis-Courmont]

Le 2014-06-16 20:41, Julien 'Lta' BALLET a écrit :
> From: Julien 'Lta' BALLET <contact at lta.io>
>
> These behaviors will be moved to playlist/directory.c, so they'll be
> available to all pf_readdir enabled access modules in the future.
> ---
>  modules/access/fs.c | 14 --------------
>  1 file changed, 14 deletions(-)
>
> diff --git a/modules/access/fs.c b/modules/access/fs.c
> index 175c549..43714ea 100644
> --- a/modules/access/fs.c
> +++ b/modules/access/fs.c
> @@ -30,17 +30,6 @@
>  #include "fs.h"
>  #include <vlc_plugin.h>
>
> -#define RECURSIVE_TEXT N_("Subdirectory behavior")
> -#define RECURSIVE_LONGTEXT N_( \
> -        "Select whether subdirectories must be expanded.\n" \
> -        "none: subdirectories do not appear in the playlist.\n" \
> -        "collapse: subdirectories appear but are expanded on first
> play.\n" \
> -        "expand: all subdirectories are expanded.\n" )
> -
> -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_( \
>          "Files with these extensions will not be added to playlist 
> when " \
> @@ -71,9 +60,6 @@ vlc_module_begin ()
>      add_submodule()
>      set_section( N_("Directory" ), NULL )
>      set_capability( "access", 55 )
> -    add_string( "recursive", "expand" , RECURSIVE_TEXT,
> -                RECURSIVE_LONGTEXT, false )
> -      change_string_list( psz_recursive_list, 
> psz_recursive_list_text )

Either add_obsolete_string() here or add_string() somewhere else is 
needed.

>      add_string( "ignore-filetypes",
> 
> "m3u,db,nfo,ini,jpg,jpeg,ljpg,gif,png,pgm,pgmyuv,pbm,pam,tga,bmp,pnm,xpm,xcf,pcx,tif,tiff,lbm,sfv,txt,sub,idx,srt,cue,ssa",
>                  IGNORE_TEXT, IGNORE_LONGTEXT, false )
>      add_string( "directory-sort", "collate", SORT_TEXT,
> SORT_LONGTEXT, false )

-- 
Rémi Denis-Courmont