X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc-module.c;h=92c05799941c2596d846c290b0922b498314c2e1;hb=263c385cdbdb7b8ddaa7e4b07634252a142c1ada;hp=754d7b2d49375d099d85b4f5a6cc4b53c625535b;hpb=37b0b026bbe92b1bda266e6f30ec37c7ceee767d;p=vlc

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 754d7b2d49..92c0579994 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -39,17 +39,17 @@
 
 #if defined (WIN32) || defined (__APPLE__)
 static const char *ppsz_language[] =
-{ "auto", "en", "en_GB", "ca", "cs", "da", "de", "es", "fr", "gl", "he", "hu",
-  "it", "ja", "ka", "ko", "ms", "nl", "oc", "pt_BR", "ro", "ru", "sk", "sl",
-  "sv", "tr", "zh_CN", "zh_TW" };
+{ "auto", "en", "en_GB", "ca", "cs", "da", "de", "es", "fa"  "fr", "gl", "he",
+   "hu", "it", "ja", "ka", "ko", "ms", "nl", "oc", "pt_BR", "ro", "ru", "sk", 
+   "sl", "sv", "tr", "zh_CN", "zh_TW" };
 
 static const char *ppsz_language_text[] =
 { N_("Auto"), N_("American English"), N_("British English"),
 N_("Catalan"), N_("Czech"), N_("Danish"), N_("German"), N_("Spanish"),
-N_("French"), N_("Galician"), N_("Hebrew"), N_("Hungarian"),N_("Italian"),
-N_("Japanese"),N_("Georgian"), N_("Korean"), N_("Malay"), N_("Dutch"),
-N_("Occitan"), N_("Brazilian Portuguese"), N_("Romanian"), N_("Russian"),
-N_("Slovak"), N_("Slovenian"), N_("Swedish"), N_("Turkish"),
+N_("Persian"), N_("French"), N_("Galician"), N_("Hebrew"), N_("Hungarian"),
+N_("Italian"), N_("Japanese"),N_("Georgian"), N_("Korean"), N_("Malay"),
+N_("Dutch"), N_("Occitan"), N_("Brazilian Portuguese"), N_("Romanian"),
+N_("Russian"), N_("Slovak"), N_("Slovenian"), N_("Swedish"), N_("Turkish"),
 N_("Simplified Chinese"), N_("Chinese Traditional") };
 #endif
 
@@ -692,6 +692,11 @@ static const char *ppsz_clock_descriptions[] =
     "This allows you to select a list of encoders that VLC will use in " \
     "priority.")
 
+#define SYSTEM_CODEC_TEXT N_("Prefer system plugins over vlc")
+#define SYSTEM_CODEC_LONGTEXT N_( \
+    "Indicates whether VLC will prefer native plugins installed " \
+    "on system over VLC owns plugins whenever a choice is available." )
+
 /*****************************************************************************
  * Sout
  ****************************************************************************/
@@ -896,7 +901,7 @@ static const char *ppsz_clock_descriptions[] =
     "for example if you associated VLC with some media types and you " \
     "don't want a new instance of VLC to be opened each time you " \
     "open a file in your file manager. This option will allow you " \
-    "to play the file with the already running instance or enqueue it." \
+    "to play the file with the already running instance or enqueue it. " \
     "This option require the D-Bus session daemon to be active " \
     "and the running instance of VLC to use D-Bus control interface.")
 
@@ -1526,6 +1531,8 @@ vlc_module_begin();
     set_subcategory( SUBCAT_INPUT_VCODEC );
     set_subcategory( SUBCAT_INPUT_ACODEC );
     set_subcategory( SUBCAT_INPUT_SCODEC );
+    add_bool( "prefer-system-codecs", VLC_FALSE, NULL, SYSTEM_CODEC_TEXT,
+                                SYSTEM_CODEC_LONGTEXT, VLC_FALSE );
 
 
 /* Stream output options */
@@ -1670,13 +1677,10 @@ vlc_module_begin();
     add_category_hint( N_("Playlist"), PLAYLIST_CAT_LONGTEXT , VLC_FALSE );
     add_bool( "random", 0, NULL, RANDOM_TEXT, RANDOM_LONGTEXT, VLC_FALSE );
         change_short('Z');
-        change_autosave();
     add_bool( "loop", 0, NULL, LOOP_TEXT, LOOP_LONGTEXT, VLC_FALSE );
         change_short('L');
-        change_autosave();
     add_bool( "repeat", 0, NULL, REPEAT_TEXT, REPEAT_LONGTEXT, VLC_FALSE );
         change_short('R');
-        change_autosave();
     add_bool( "play-and-exit", 0, NULL, PAE_TEXT, PAE_LONGTEXT, VLC_FALSE );
     add_bool( "play-and-stop", 0, NULL, PAS_TEXT, PAS_LONGTEXT, VLC_FALSE );
     add_bool( "media-library", 1, NULL, ML_TEXT, ML_LONGTEXT, VLC_FALSE );
@@ -2176,17 +2180,17 @@ vlc_module_end();
 
 const module_config_t libvlc_config[] =
 {
-    { 
+    {
         .i_type   = CONFIG_ITEM_BOOL,
         .psz_name = "help",
         .i_short  = 'h',
-        .psz_text = N_("print help for VLC (can be combined with --advanced)")
+        .psz_text = N_("print help for VLC (can be combined with --advanced and --help-verbose)")
     },
     {
         .i_type   = CONFIG_ITEM_BOOL,
         .psz_name = "longhelp",
         .i_short  = 'H',
-        .psz_text = N_("print help for VLC and all its modules (can be combined with --advanced)")
+        .psz_text = N_("print help for VLC and all its modules (can be combined with --advanced and --help-verbose)")
     },
     {
         .i_type   = CONFIG_ITEM_BOOL,
@@ -2204,11 +2208,16 @@ const module_config_t libvlc_config[] =
         .i_short  = 'l',
         .psz_text = N_("print a list of available modules")
     },
+    {
+        .i_type   = CONFIG_ITEM_BOOL,
+        .psz_name = "list-verbose",
+        .psz_text = N_("print a list of available modules with extra detail")
+    },
     {
         .i_type   = CONFIG_ITEM_STRING,
         .psz_name = "module",
         .i_short  = 'p',
-        .psz_text = N_("print help on a specific module (can be combined with --advanced)")
+        .psz_text = N_("print help on a specific module (can be combined with --advanced and --help-verbose)")
     },
     {
         .i_type   = CONFIG_ITEM_BOOL,