X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc-module.c;h=a93822aaef5f7b87d552c7cf4936aee4aaacc034;hb=f2b2e37c04b2921e29daa3260dc696646ad4f10c;hp=fcb98d7976589e9e00746564ef9612374688506c;hpb=cbca7229daf9e6a12a3e7e10bf34548da72502fb;p=vlc diff --git a/src/libvlc-module.c b/src/libvlc-module.c index fcb98d7976..a93822aaef 100644 --- a/src/libvlc-module.c +++ b/src/libvlc-module.c @@ -397,20 +397,20 @@ static const char *const ppsz_align_descriptions[] = #define VIDEO_ON_TOP_LONGTEXT N_( \ "Always place the video window on top of other windows." ) -#define VIDEO_TITLE_SHOW_TEXT N_("Show media title on video.") +#define VIDEO_TITLE_SHOW_TEXT N_("Show media title on video") #define VIDEO_TITLE_SHOW_LONGTEXT N_( \ "Display the title of the video on top of the movie.") -#define VIDEO_TITLE_TIMEOUT_TEXT N_("Show video title for x miliseconds.") +#define VIDEO_TITLE_TIMEOUT_TEXT N_("Show video title for x miliseconds") #define VIDEO_TITLE_TIMEOUT_LONGTEXT N_( \ "Show the video title for n miliseconds, default is 5000 ms (5 sec.)") -#define VIDEO_TITLE_POSITION_TEXT N_("Position of video title.") +#define VIDEO_TITLE_POSITION_TEXT N_("Position of video title") #define VIDEO_TITLE_POSITION_LONGTEXT N_( \ "Place on video where to display the title (default bottom center).") #define MOUSE_HIDE_TIMEOUT_TEXT N_("Hide cursor and fullscreen " \ - "controller after x miliseconds.") + "controller after x miliseconds") #define MOUSE_HIDE_TIMEOUT_LONGTEXT N_( \ "Hide mouse cursor and fullscreen controller after " \ "n miliseconds, default is 3000 ms (3 sec.)") @@ -423,7 +423,7 @@ static const char *const ppsz_pos_descriptions[] = #define SS_TEXT N_("Disable screensaver") #define SS_LONGTEXT N_("Disable the screensaver during video playback." ) -#define INHIBIT_TEXT N_("Inhibits the power management daemon during playback.") +#define INHIBIT_TEXT N_("Inhibit the power management daemon during playback") #define INHIBIT_LONGTEXT N_("Inhibits the power management daemon during any " \ "playback, to avoid the computer being suspended because of inactivity.") @@ -827,7 +827,7 @@ static const char *const 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_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." ) @@ -1000,8 +1000,8 @@ static const char *const ppsz_clock_descriptions[] = "This option is useful if you want to lower the latency when " \ "reading a stream") -#define AUTO_ADJUST_PTS_DELAY N_("(Experimental) Auto adjust the caching done "\ - "to minimize latency when reading live stream.") +#define AUTO_ADJUST_PTS_DELAY N_("(Experimental) Minimize latency when" \ + "reading live stream.") #define AUTO_ADJUST_PTS_DELAY_LONGTEXT N_( \ "This option is useful if you want to lower the latency when " \ "reading a stream") @@ -1009,7 +1009,7 @@ static const char *const ppsz_clock_descriptions[] = #define PLUGIN_PATH_TEXT N_("Modules search path") #define PLUGIN_PATH_LONGTEXT N_( \ "Additional path for VLC to look for its modules. You can add " \ - "several paths by concatenating them using " PATH_SEP " as separator") + "several paths by concatenating them using \" PATH_SEP \" as separator") #define VLM_CONF_TEXT N_("VLM configuration file") #define VLM_CONF_LONGTEXT N_( \ @@ -1352,9 +1352,9 @@ static const char *const ppsz_albumart_descriptions[] = "video output for the time being." ) #define MENU_ON_KEY_TEXT N_("Display OSD menu on top of video output") -#define MENU_ON_KEY_LONGTEXT N_("Display OSDmenu on top of video output") +#define MENU_ON_KEY_LONGTEXT N_("Display OSD menu on top of video output") #define MENU_OFF_KEY_TEXT N_("Do not display OSD menu on video output") -#define MENU_OFF_KEY_LONGTEXT N_("Do not display OSDmenu on top of video output") +#define MENU_OFF_KEY_LONGTEXT N_("Do not display OSD menu on top of video output") #define MENU_RIGHT_KEY_TEXT N_("Highlight widget on the right") #define MENU_RIGHT_KEY_LONGTEXT N_( \ "Move OSD menu highlight to the widget on the right") @@ -1429,6 +1429,7 @@ vlc_module_begin(); add_category_hint( N_("Audio"), AOUT_CAT_LONGTEXT , false ); add_bool( "audio", 1, NULL, AUDIO_TEXT, AUDIO_LONGTEXT, false ); + change_safe(); add_integer_with_range( "volume", AOUT_VOLUME_DEFAULT, AOUT_VOLUME_MIN, AOUT_VOLUME_MAX, NULL, VOLUME_TEXT, VOLUME_LONGTEXT, false ); @@ -1447,6 +1448,7 @@ vlc_module_begin(); change_integer_list( pi_force_dolby_values, ppsz_force_dolby_descriptions, 0 ); add_integer( "audio-desync", 0, NULL, DESYNC_TEXT, DESYNC_LONGTEXT, true ); + change_safe(); /* FIXME TODO create a subcat replay gain ? */ add_string( "audio-replay-gain-mode", ppsz_replay_gain_mode[0], NULL, AUDIO_REPLAY_GAIN_MODE_TEXT, @@ -1477,11 +1479,13 @@ vlc_module_begin(); add_category_hint( N_("Video"), VOUT_CAT_LONGTEXT , false ); add_bool( "video", 1, NULL, VIDEO_TEXT, VIDEO_LONGTEXT, true ); + change_safe(); add_bool( "grayscale", 0, NULL, GRAYSCALE_TEXT, GRAYSCALE_LONGTEXT, true ); add_bool( "fullscreen", 0, NULL, FULLSCREEN_TEXT, FULLSCREEN_LONGTEXT, false ); change_short('f'); + change_safe(); add_bool( "embedded-video", 1, NULL, EMBEDDED_TEXT, EMBEDDED_LONGTEXT, true ); #ifdef __APPLE__ @@ -1508,11 +1512,10 @@ vlc_module_begin(); VIDEO_TITLE_TIMEOUT_LONGTEXT, false ); add_integer( "video-title-position", 8, NULL, VIDEO_TITLE_POSITION_TEXT, VIDEO_TITLE_POSITION_LONGTEXT, false ); - // autohide after 3s - add_integer( "mouse-hide-timeout", 3000, NULL, MOUSE_HIDE_TIMEOUT_TEXT, - MOUSE_HIDE_TIMEOUT_LONGTEXT, false ); change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 ); - + // autohide after 1.5s + add_integer( "mouse-hide-timeout", 1500, NULL, MOUSE_HIDE_TIMEOUT_TEXT, + MOUSE_HIDE_TIMEOUT_LONGTEXT, false ); set_section( N_("Snapshot") , NULL ); add_directory( "snapshot-path", NULL, NULL, SNAP_PATH_TEXT, SNAP_PATH_LONGTEXT, false ); @@ -1533,14 +1536,20 @@ vlc_module_begin(); set_section( N_("Window properties" ), NULL ); add_integer( "width", -1, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, true ); + 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 ); + change_safe(); add_integer( "video-y", -1, NULL, VIDEOY_TEXT, VIDEOY_LONGTEXT, true ); + change_safe(); add_string( "crop", NULL, NULL, CROP_TEXT, CROP_LONGTEXT, false ); + change_safe(); add_string( "custom-crop-ratios", NULL, NULL, CUSTOM_CROP_RATIOS_TEXT, CUSTOM_CROP_RATIOS_LONGTEXT, false ); add_string( "aspect-ratio", NULL, NULL, ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, false ); + change_safe(); add_string( "monitor-par", NULL, NULL, MASPECT_RATIO_TEXT, MASPECT_RATIO_LONGTEXT, true ); add_string( "custom-aspect-ratios", NULL, NULL, CUSTOM_ASPECT_RATIOS_TEXT, @@ -1577,6 +1586,7 @@ vlc_module_begin(); add_category_hint( N_("Subpictures"), SUB_CAT_LONGTEXT , false ); add_bool( "spu", 1, NULL, SPU_TEXT, SPU_LONGTEXT, true ); + change_safe(); add_bool( "osd", 1, NULL, OSD_TEXT, OSD_LONGTEXT, false ); add_module( "text-renderer", "text renderer", NULL, NULL, TEXTRENDERER_TEXT, TEXTRENDERER_LONGTEXT, true ); @@ -1609,34 +1619,46 @@ vlc_module_begin(); set_section( N_( "Track settings" ), NULL ); add_integer( "program", 0, NULL, INPUT_PROGRAM_TEXT, INPUT_PROGRAM_LONGTEXT, true ); + change_safe(); add_string( "programs", "", NULL, INPUT_PROGRAMS_TEXT, INPUT_PROGRAMS_LONGTEXT, true ); + change_safe(); add_integer( "audio-track", -1, NULL, INPUT_AUDIOTRACK_TEXT, INPUT_AUDIOTRACK_LONGTEXT, true ); - add_deprecated_alias( "audio-channel" ); /*deprecated since 0.8.2 */ + change_safe(); + add_deprecated_alias( "audio-channel" ); /*deprecated since 0.8.2 */ add_integer( "sub-track", -1, NULL, INPUT_SUBTRACK_TEXT, INPUT_SUBTRACK_LONGTEXT, true ); - add_deprecated_alias("spu-channel" ); /*deprecated since 0.8.2*/ + change_safe(); + add_deprecated_alias("spu-channel" ); /*deprecated since 0.8.2*/ add_string( "audio-language", "", NULL, INPUT_AUDIOTRACK_LANG_TEXT, INPUT_AUDIOTRACK_LANG_LONGTEXT, false ); + change_safe(); add_string( "sub-language", "", NULL, INPUT_SUBTRACK_LANG_TEXT, INPUT_SUBTRACK_LANG_LONGTEXT, false ); + change_safe(); add_integer( "audio-track-id", -1, NULL, INPUT_AUDIOTRACK_ID_TEXT, INPUT_AUDIOTRACK_ID_LONGTEXT, true ); + change_safe(); add_integer( "sub-track-id", -1, NULL, INPUT_SUBTRACK_ID_TEXT, INPUT_SUBTRACK_ID_LONGTEXT, true ); + change_safe(); set_section( N_( "Playback control" ) , NULL); add_integer( "input-repeat", 0, NULL, INPUT_REPEAT_TEXT, INPUT_REPEAT_LONGTEXT, false ); + change_safe(); add_integer( "start-time", 0, NULL, START_TIME_TEXT, START_TIME_LONGTEXT, true ); + change_safe(); add_integer( "stop-time", 0, NULL, STOP_TIME_TEXT, STOP_TIME_LONGTEXT, true ); + change_safe(); add_integer( "run-time", 0, NULL, RUN_TIME_TEXT, RUN_TIME_LONGTEXT, true ); + change_safe(); add_string( "input-list", NULL, NULL, INPUT_LIST_TEXT, INPUT_LIST_LONGTEXT, true ); add_string( "input-slave", NULL, NULL, @@ -1828,10 +1850,10 @@ vlc_module_begin(); change_need_restart(); add_bool( "use-stream-immediate", false, NULL, - USE_STREAM_IMMEDIATE, USE_STREAM_IMMEDIATE_LONGTEXT, false ); + USE_STREAM_IMMEDIATE, USE_STREAM_IMMEDIATE_LONGTEXT, true ); add_bool( "auto-adjust-pts-delay", false, NULL, - AUTO_ADJUST_PTS_DELAY, AUTO_ADJUST_PTS_LONGTEXT, false ); + AUTO_ADJUST_PTS_DELAY, AUTO_ADJUST_PTS_DELAY_LONGTEXT, true ); #if !defined(__APPLE__) && !defined(SYS_BEOS) && defined(LIBVLC_USE_PTHREAD) add_bool( "rt-priority", false, NULL, RT_PRIORITY_TEXT, @@ -2448,6 +2470,8 @@ vlc_module_begin(); #define HELP_TEXT \ N_("print help for VLC (can be combined with --advanced and " \ "--help-verbose)") +#define FULL_HELP_TEXT \ + N_("Exhaustive help for VLC and its modules") #define LONGHELP_TEXT \ N_("print help for VLC and all its modules (can be combined with " \ "--advanced and --help-verbose)") @@ -2477,10 +2501,13 @@ vlc_module_begin(); change_short( 'h' ); change_internal(); change_unsaveable(); - add_bool( "longhelp", false, NULL, LONGHELP_TEXT, "", false ); + add_bool( "full-help", false, NULL, FULL_HELP_TEXT, "", false ); change_short( 'H' ); change_internal(); change_unsaveable(); + add_bool( "longhelp", false, NULL, LONGHELP_TEXT, "", false ); + change_internal(); + change_unsaveable(); add_bool( "help-verbose", false, NULL, HELP_VERBOSE_TEXT, "", false ); change_internal(); @@ -2505,7 +2532,7 @@ vlc_module_begin(); false ); change_internal(); change_unsaveable(); - add_bool( "reset-config", false, NULL, MODULE_TEXT, "", false ); + add_bool( "reset-config", false, NULL, RESET_CONFIG_TEXT, "", false ); change_internal(); change_unsaveable(); add_bool( "reset-plugins-cache", false, NULL,