X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc-module.c;h=d4077fe6b3e65609b997f51cb8b2d8f036da40ea;hb=69d7fdea2da6f773fd7993f78c2bea494eb2d819;hp=ac1e92b7d57b33a9d6d6a488f525605c9a8c9954;hpb=832df23afaf5500ce2b00a1cce1c340383e3073c;p=vlc diff --git a/src/libvlc-module.c b/src/libvlc-module.c index ac1e92b7d5..d4077fe6b3 100644 --- a/src/libvlc-module.c +++ b/src/libvlc-module.c @@ -73,6 +73,7 @@ static const char *const ppsz_language[] = "lt", "mn", "ms", + "nn", "kk", "km", "oc", @@ -92,6 +93,7 @@ static const char *const ppsz_language[] = "tr", "uk", "vi", + "wa", }; static const char *const ppsz_language_text[] = @@ -123,6 +125,7 @@ static const char *const ppsz_language_text[] = "lietuvių", "Монгол хэл", "Melayu", + "Nynorsk", "Қазақ тілі", "ភាសាខ្មែរ", "Occitan", @@ -142,6 +145,7 @@ static const char *const ppsz_language_text[] = "Türkçe", "украї́нська мо́ва", "tiếng Việt", + "Walon", }; #endif @@ -175,7 +179,7 @@ static const char *const ppsz_snap_formats[] = #define EXTRAINTF_LONGTEXT N_( \ "You can select \"additional interfaces\" for VLC. " \ "They will be launched in the background in addition to the default " \ - "interface. Use a comma separated list of interface modules. (common " \ + "interface. Use a colon separated list of interface modules. (common " \ "values are \"rc\" (remote control), \"http\", \"gestures\" ...)") #define CONTROL_TEXT N_("Control interfaces") @@ -193,7 +197,7 @@ static const char *const ppsz_snap_formats[] = "This is a ',' separated string, each objects should be prefixed by " \ "a '+' or a '-' to respectively enable or disable it. The keyword " \ "'all' refers to all objects. Objects can be refered to by their " \ - "type or module name. Rules applying to named objects take precendence " \ + "type or module name. Rules applying to named objects take precedence " \ "over rules applying to object types. Note that you still need to " \ "use -vvv to actually display debug message.") @@ -278,14 +282,14 @@ static const char *const ppsz_snap_formats[] = #if !defined( __APPLE__ ) #define AOUT_RESAMP_TEXT N_("High quality audio resampling") #define AOUT_RESAMP_LONGTEXT N_( \ - "This uses a high quality audio resampling algorithm. High quality "\ + "This uses a high quality audio resampling algorithm. High quality " \ "audio resampling can be processor intensive so you can " \ "disable it and a cheaper resampling algorithm will be used instead.") #endif #define DESYNC_TEXT N_("Audio desynchronization compensation") #define DESYNC_LONGTEXT N_( \ - "This delays the audio output. The delay must be given in milliseconds." \ + "This delays the audio output. The delay must be given in milliseconds. " \ "This can be handy if you notice a lag between the video and the audio.") #define MULTICHA_TEXT N_("Audio output channels mode") @@ -342,7 +346,7 @@ static const char *const ppsz_force_dolby_descriptions[] = { #define AUDIO_TIME_STRETCH_TEXT N_( \ "Enable time streching audio" ) #define AUDIO_TIME_STRETCH_LONGTEXT N_( \ - "This allows to play audio at lower or higher speed without" \ + "This allows to play audio at lower or higher speed without " \ "affecting the audio pitch" ) @@ -508,7 +512,7 @@ static const char *const ppsz_pos_descriptions[] = #define VIDEO_FILTER_TEXT N_("Video filter module") #define VIDEO_FILTER_LONGTEXT N_( \ "This adds post-processing filters to enhance the " \ - "picture quality, for instance deinterlacing, or distort" \ + "picture quality, for instance deinterlacing, or distort " \ "the video.") #define SNAP_PATH_TEXT N_("Video snapshot directory (or filename)") @@ -609,7 +613,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 +638,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 +710,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") @@ -764,7 +773,7 @@ static const char *const ppsz_clock_descriptions[] = #define INPUT_RECORD_NATIVE_TEXT N_("Prefer native stream recording") #define INPUT_RECORD_NATIVE_LONGTEXT N_( \ - "When possible, the input stream will be recorded instead of using" \ + "When possible, the input stream will be recorded instead of using " \ "the stream output module" ) #define INPUT_TIMESHIFT_PATH_TEXT N_("Timeshift directory") @@ -843,14 +852,8 @@ static const char *const ppsz_clock_descriptions[] = #endif #define VCD_DEV_TEXT N_("VCD device") -#ifdef HAVE_VCDX -#define VCD_DEV_LONGTEXT N_( \ - "This is the default VCD device to use. " \ - "If you don't specify anything, we'll scan for a suitable CD-ROM device." ) -#else #define VCD_DEV_LONGTEXT N_( \ "This is the default VCD device to use." ) -#endif #define CDAUDIO_DEV_TEXT N_("Audio CD device") #define CDAUDIO_DEV_LONGTEXT N_( \ @@ -948,7 +951,7 @@ static const char *const ppsz_clock_descriptions[] = #define SOUT_TEXT N_("Default stream output chain") #define SOUT_LONGTEXT N_( \ "You can enter here a default stream output chain. Refer to "\ - "the documentation to learn how to build such chains." \ + "the documentation to learn how to build such chains. " \ "Warning: this chain will be enabled for all streams." ) #define SOUT_ALL_TEXT N_("Enable streaming of all ES") @@ -1223,7 +1226,7 @@ static const char *const ppsz_albumart_descriptions[] = #define SD_TEXT N_( "Services discovery modules") #define SD_LONGTEXT N_( \ "Specifies the services discovery modules to load, separated by " \ - "semi-colons. Typical values are sap, hal, ..." ) + "colons. Typical values are sap, hal, ..." ) #define RANDOM_TEXT N_("Play files randomly forever") #define RANDOM_LONGTEXT N_( \ @@ -1652,6 +1655,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 ) @@ -1698,9 +1702,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 () @@ -1906,6 +1910,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 ) @@ -2074,8 +2081,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 ) @@ -2728,7 +2734,7 @@ vlc_module_begin () N_("print a list of available modules with extra detail") #define MODULE_TEXT \ N_("print help on a specific module (can be combined with --advanced " \ - "and --help-verbose). Prefix the module name with = for strict" \ + "and --help-verbose). Prefix the module name with = for strict " \ "matches.") #define IGNORE_CONFIG_TEXT \ N_("no configuration option will be loaded nor saved to config file") @@ -2743,51 +2749,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 ) */