Cleanup private and volatile option

[vlc] / src / libvlc-module.c

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 95b60bcc7a36193618ceab4d6cbde706ee7e088b..b1384567698f150c47285c8ae30b8ec16de588f2 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -609,7 +609,7 @@ static const char *const ppsz_pos_descriptions[] =
 #define KEYBOARD_EVENTS_LONGTEXT N_( \
     "This enables VLC hotkeys from the (non-embedded) video window." )
 
-#define MOUSE_EVENTS_TEXT N_("Key press events")
+#define MOUSE_EVENTS_TEXT N_("Mouse events")
 #define MOUSE_EVENTS_LONGTEXT N_( \
     "This enables handling of mouse clicks on the video." )
 
@@ -634,6 +634,11 @@ static const char *const ppsz_pos_descriptions[] =
     "real-time sources. Use this if you experience jerky playback of " \
     "network streams.")
 
+#define CLOCK_JITTER_TEXT N_("Clock jitter")
+#define CLOCK_JITTER_LONGTEXT N_( \
+    "It tells the clock algorithms what is the maximal input jitter that " \
+    "is considered valid and can be compensated (in milliseconds)" )
+
 #define NETSYNC_TEXT N_("Network synchronisation" )
 #define NETSYNC_LONGTEXT N_( "This allows you to remotely " \
         "synchronise clocks for server and client. The detailed settings " \
@@ -701,12 +706,12 @@ static const char *const ppsz_clock_descriptions[] =
 #define INPUT_AUDIOTRACK_LANG_TEXT N_("Audio language")
 #define INPUT_AUDIOTRACK_LANG_LONGTEXT N_( \
     "Language of the audio track you want to use " \
-    "(comma separated, two or three letter country code).")
+    "(comma separated, two or three letter country code, you may use 'none' to avoid a fallback to another language).")
 
 #define INPUT_SUBTRACK_LANG_TEXT N_("Subtitle language")
 #define INPUT_SUBTRACK_LANG_LONGTEXT N_( \
     "Language of the subtitle track you want to use " \
-    "(comma separated, two or three letters country code).")
+    "(comma separated, two or three letters country code, you may use 'any' as a fallback).")
 
 /// \todo Document how to find it
 #define INPUT_AUDIOTRACK_ID_TEXT N_("Audio track ID")
@@ -1646,6 +1651,7 @@ vlc_module_begin ()
     add_obsolete_integer( "x11-event" ) /* renamed since 1.0.0 */
 #ifndef __APPLE__
     add_bool( "overlay", 1, NULL, OVERLAY_TEXT, OVERLAY_LONGTEXT, false )
+        change_safe()
 #endif
     add_bool( "video-on-top", 0, NULL, VIDEO_ON_TOP_TEXT,
               VIDEO_ON_TOP_LONGTEXT, false )
@@ -1692,9 +1698,9 @@ vlc_module_begin ()
         change_safe ()
     add_integer( "height", -1, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, true )
         change_safe ()
-    add_integer( "video-x", -1, NULL, VIDEOX_TEXT, VIDEOX_LONGTEXT, true )
+    add_integer( "video-x", 0, NULL, VIDEOX_TEXT, VIDEOX_LONGTEXT, true )
         change_safe ()
-    add_integer( "video-y", -1, NULL, VIDEOY_TEXT, VIDEOY_LONGTEXT, true )
+    add_integer( "video-y", 0, NULL, VIDEOY_TEXT, VIDEOY_LONGTEXT, true )
         change_safe ()
     add_string( "crop", NULL, NULL, CROP_TEXT, CROP_LONGTEXT, false )
         change_safe ()
@@ -1900,6 +1906,9 @@ vlc_module_begin ()
     add_integer( "clock-synchro", -1, NULL, CLOCK_SYNCHRO_TEXT,
                  CLOCK_SYNCHRO_LONGTEXT, true )
         change_integer_list( pi_clock_values, ppsz_clock_descriptions, NULL )
+    add_integer( "clock-jitter", 5 * CLOCK_FREQ/1000, NULL, CLOCK_JITTER_TEXT,
+              CLOCK_JITTER_LONGTEXT, true )
+        change_safe()
 
     add_bool( "network-synchronisation", false, NULL, NETSYNC_TEXT,
               NETSYNC_LONGTEXT, true )
@@ -2068,8 +2077,7 @@ vlc_module_begin ()
               ONEINSTANCE_LONGTEXT, true )
     add_bool( "started-from-file", 0, NULL, STARTEDFROMFILE_TEXT,
               STARTEDFROMFILE_LONGTEXT, true )
-        change_internal ()
-        change_unsaveable ()
+        change_volatile ()
     add_bool( "one-instance-when-started-from-file", 1, NULL,
               ONEINSTANCEWHENSTARTEDFROMFILE_TEXT,
               ONEINSTANCEWHENSTARTEDFROMFILE_LONGTEXT, true )
@@ -2737,51 +2745,38 @@ vlc_module_begin ()
 
     add_bool( "help", false, NULL, HELP_TEXT, "", false )
         change_short( 'h' )
-        change_internal ()
-        change_unsaveable ()
+        change_volatile ()
     add_bool( "full-help", false, NULL, FULL_HELP_TEXT, "", false )
         change_short( 'H' )
-        change_internal ()
-        change_unsaveable ()
+        change_volatile ()
     add_bool( "longhelp", false, NULL, LONGHELP_TEXT, "", false )
-        change_internal ()
-        change_unsaveable ()
+        change_volatile ()
     add_bool( "help-verbose", false, NULL, HELP_VERBOSE_TEXT, "",
               false )
-        change_internal ()
-        change_unsaveable ()
+        change_volatile ()
     add_bool( "list", false, NULL, LIST_TEXT, "", false )
         change_short( 'l' )
-        change_internal ()
-        change_unsaveable ()
+        change_volatile ()
     add_bool( "list-verbose", false, NULL, LIST_VERBOSE_TEXT, "",
               false )
-        change_internal ()
-        change_unsaveable ()
+        change_volatile ()
     add_string( "module", NULL, NULL, MODULE_TEXT, "", false )
         change_short( 'p' )
-        change_internal ()
-        change_unsaveable ()
+        change_volatile ()
     add_bool( "ignore-config", true, NULL, IGNORE_CONFIG_TEXT, "", false )
-        change_internal ()
-        change_unsaveable ()
+        change_volatile ()
     add_obsolete_bool( "save-config" )
     add_bool( "reset-config", false, NULL, RESET_CONFIG_TEXT, "", false )
-        change_internal ()
-        change_unsaveable ()
+        change_volatile ()
     add_bool( "reset-plugins-cache", false, NULL,
               RESET_PLUGINS_CACHE_TEXT, "", false )
-        change_internal ()
-        change_unsaveable ()
+        change_volatile ()
     add_bool( "version", false, NULL, VERSION_TEXT, "", false )
-        change_internal ()
-        change_unsaveable ()
+        change_volatile ()
     add_string( "config", NULL, NULL, CONFIG_TEXT, "", false )
-        change_internal ()
-        change_unsaveable ()
+        change_volatile ()
     add_bool( "version", false, NULL, VERSION_TEXT, "", false )
-        change_internal ()
-        change_unsaveable ()
+        change_volatile ()
 
    /* Usage (mainly useful for cmd line stuff) */
     /* add_usage_hint( PLAYLIST_USAGE ) */