X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc-module.c;h=3f7e94ae13cf702fae2186db71c3a836cf9b84e4;hb=c4d19b859876eee3510940ae172d66d4723ba1a8;hp=c1611f1bc982a68654eb57f88682c178a5b7904f;hpb=5a09a2df55de2f8336ff9d954e536dee9bb9bc18;p=vlc

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index c1611f1bc9..3f7e94ae13 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -39,18 +39,76 @@
 
 #if defined (WIN32) || defined (__APPLE__)
 static const char *ppsz_language[] =
-{ "auto", "en", "ar", "pt_BR", "en_GB", "ca", "zh_TW", "cs", "da", "nl", "fr",
-  "gl", "ka", "de", "he", "hu", "it", "ja", "ko", "ms", "oc", "fa", "pl", "ro",
-  "ru", "zh_CN", "sk", "sl", "es", "sv", "tr" };
+{
+    "auto",
+    "en",
+    "ar",
+    "pt_BR",
+    "en_GB",
+    "ca",
+    "zh_TW",
+    "cs",
+    "da",
+    "nl",
+    "fi",
+    "fr",
+    "gl",
+    "ka",
+    "de",
+    "he",
+    "hu",
+    "it",
+    "ja",
+    "ko",
+    "ms",
+    "oc",
+    "fa",
+    "pl",
+    "ro",
+    "ru",
+    "zh_CN",
+    "sk",
+    "sl",
+    "es",
+    "sv",
+    "tr"
+};
 
 static const char *ppsz_language_text[] =
-{ N_("Auto"), N_("American English"), N_("Arabic"), N_("Brazilian Portuguese"),
-  N_("British English"), N_("Catalan"), N_("Chinese Traditional"), N_("Czech"),
-  N_("Danish"), N_("Dutch"), N_("French"), N_("Galician"), N_("Georgian"),
-  N_("German"), N_("Hebrew"), N_("Hungarian"), N_("Italian"), N_("Japanese"),
-  N_("Korean"), N_("Malay"), N_("Occitan"), N_("Persian"), N_("Polish"),
-  N_("Romanian"), N_("Russian"), N_("Simplified Chinese"), N_("Slovak"),
-  N_("Slovenian"), N_("Spanish"), N_("Swedish"), N_("Turkish") };
+{
+    N_("Auto"),
+    N_("American English"),
+    N_("Arabic"),
+    N_("Brazilian Portuguese"),
+    N_("British English"),
+    N_("Catalan"),
+    N_("Chinese Traditional"),
+    N_("Czech"),
+    N_("Danish"),
+    N_("Dutch"),
+    N_("Finnish"),
+    N_("French"),
+    N_("Galician"),
+    N_("Georgian"),
+    N_("German"),
+    N_("Hebrew"),
+    N_("Hungarian"),
+    N_("Italian"),
+    N_("Japanese"),
+    N_("Korean"),
+    N_("Malay"),
+    N_("Occitan"),
+    N_("Persian"),
+    N_("Polish"),
+    N_("Romanian"),
+    N_("Russian"),
+    N_("Simplified Chinese"),
+    N_("Slovak"),
+    N_("Slovenian"),
+    N_("Spanish"),
+    N_("Swedish"),
+    N_("Turkish")
+};
 #endif
 
 static const char *ppsz_snap_formats[] =
@@ -786,6 +844,11 @@ static const char *ppsz_clock_descriptions[] =
     "multiple playlist item (automatically insert the gather stream output " \
     "if not specified)" )
 
+#define SOUT_MUX_CACHING_TEXT N_("Stream output muxer caching (ms)")
+#define SOUT_MUX_CACHING_LONGTEXT N_( \
+    "This allow you to configure the initial caching amount for stream output " \
+    " muxer. This value should be set in milliseconds." )
+
 #define PACKETIZER_TEXT N_("Preferred packetizer list")
 #define PACKETIZER_LONGTEXT N_( \
     "This allows you to select the order in which VLC will choose its " \
@@ -1628,6 +1691,8 @@ vlc_module_begin();
                                 SOUT_VIDEO_LONGTEXT, VLC_TRUE );
     add_bool( "sout-spu", 1, NULL, SOUT_SPU_TEXT,
                                 SOUT_SPU_LONGTEXT, VLC_TRUE );
+    add_integer( "sout-mux-caching", 1500, NULL, SOUT_MUX_CACHING_TEXT,
+                                SOUT_MUX_CACHING_LONGTEXT, VLC_TRUE );
 
     set_section( N_("VLM"), NULL );
     add_string( "vlm-conf", NULL, NULL, VLM_CONF_TEXT,
@@ -1721,6 +1786,7 @@ vlc_module_begin();
               ONEINSTANCE_DBUS_LONGTEXT, VLC_TRUE );
     add_bool( "playlist-enqueue", 0, NULL, PLAYLISTENQUEUE_TEXT,
               PLAYLISTENQUEUE_LONGTEXT, VLC_TRUE );
+        change_unsaveable();
 #endif
 
 #if defined(WIN32)
@@ -1735,6 +1801,7 @@ vlc_module_begin();
               ONEINSTANCEWHENSTARTEDFROMFILE_LONGTEXT, VLC_TRUE );
     add_bool( "playlist-enqueue", 0, NULL, PLAYLISTENQUEUE_TEXT,
               PLAYLISTENQUEUE_LONGTEXT, VLC_TRUE );
+        change_unsaveable();
     add_bool( "high-priority", 0, NULL, HPRIORITY_TEXT,
               HPRIORITY_LONGTEXT, VLC_FALSE );
         change_need_restart();
@@ -1809,7 +1876,7 @@ vlc_module_begin();
         change_need_restart();
 #endif
 
-    add_bool( "color", 0, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE );
+    add_bool( "color", VLC_TRUE, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE );
     add_bool( "advanced", 0, NULL, ADVANCED_TEXT, ADVANCED_LONGTEXT,
                     VLC_FALSE );
         change_need_restart();