vlc | branch: master | Thomas Guillem <[email protected]> | Wed May 13 09:22:35 2015 +0200| [8990da12cc174be455d02f1c18a403ec7e6539c8] | committer: Thomas Guillem
demux/playlist: move recursive option > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8990da12cc174be455d02f1c18a403ec7e6539c8 --- modules/demux/playlist/playlist.c | 14 ++++++++++++++ src/libvlc-module.c | 15 --------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/modules/demux/playlist/playlist.c b/modules/demux/playlist/playlist.c index 243e342..185273b 100644 --- a/modules/demux/playlist/playlist.c +++ b/modules/demux/playlist/playlist.c @@ -51,6 +51,17 @@ #define SKIP_ADS_LONGTEXT N_( "Use playlist options usually used to prevent " \ "ads skipping to detect ads and prevent adding them to the playlist." ) +static const char *const psz_recursive_list[] = { "none", "collapse", "expand" }; +static const char *const psz_recursive_list_text[] = { + N_("None"), N_("Collapse"), N_("Expand"), N_("Expand distant files") }; + +#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_sort_list[] = { "collate", "version", "none" }; static const char *const psz_sort_list_text[] = { N_("Sort alphabetically according to the current language's collation rules."), @@ -166,6 +177,9 @@ vlc_module_begin () add_shortcut( "playlist", "directory" ) set_capability( "demux", 10 ) set_callbacks( Import_Dir, Close_Dir ) + add_string( "recursive", "collapse" , RECURSIVE_TEXT, + RECURSIVE_LONGTEXT, false ) + change_string_list( psz_recursive_list, psz_recursive_list_text ) 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 ) diff --git a/src/libvlc-module.c b/src/libvlc-module.c index 42502bd..65a9269 100644 --- a/src/libvlc-module.c +++ b/src/libvlc-module.c @@ -1091,17 +1091,6 @@ static const char *const ppsz_prefres[] = { "Automatically preparse files added to the playlist " \ "(to retrieve some metadata)." ) -#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"), N_("Expand distant files") }; - #define METADATA_NETWORK_TEXT N_( "Allow metadata network access" ) #define SD_TEXT N_( "Services discovery modules") @@ -2023,10 +2012,6 @@ vlc_module_begin () add_bool( "auto-preparse", true, PREPARSE_TEXT, PREPARSE_LONGTEXT, false ) - add_string( "recursive", "collapse" , RECURSIVE_TEXT, - RECURSIVE_LONGTEXT, false ) - change_string_list( psz_recursive_list, psz_recursive_list_text ) - add_obsolete_integer( "album-art" ) add_bool( "metadata-network-access", false, METADATA_NETWORK_TEXT, METADATA_NETWORK_TEXT, false ) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
