X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc-module.c;h=bc34f8741e5641e43d7ec7a4a846cb343f765e59;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=9398a0439e001b8d50e882bb5078802e4b42e4a3;hpb=5fd5aaf262c319d3324e326405ee04cd72a59c74;p=vlc diff --git a/src/libvlc-module.c b/src/libvlc-module.c index 9398a0439e..bc34f8741e 100644 --- a/src/libvlc-module.c +++ b/src/libvlc-module.c @@ -66,6 +66,7 @@ static const char *const ppsz_language[] = "he", "hr", "hu", + "hy", "id", "it", "ja", @@ -73,6 +74,7 @@ static const char *const ppsz_language[] = "lt", "mn", "ms", + "nn", "kk", "km", "oc", @@ -83,6 +85,7 @@ static const char *const ppsz_language[] = "ro", "ru", "zh_CN", + "si", "sr", "sk", "sl", @@ -92,6 +95,7 @@ static const char *const ppsz_language[] = "tr", "uk", "vi", + "wa", }; static const char *const ppsz_language_text[] = @@ -116,6 +120,7 @@ static const char *const ppsz_language_text[] = "עברית", "hrvatski", "Magyar", + "հայերեն", "Bahasa Indonesia", "Italiano", "日本語", @@ -123,6 +128,7 @@ static const char *const ppsz_language_text[] = "lietuvių", "Монгол хэл", "Melayu", + "Nynorsk", "Қазақ тілі", "ភាសាខ្មែរ", "Occitan", @@ -133,6 +139,7 @@ static const char *const ppsz_language_text[] = "Română", "Русский", "简体中文", + "සිංහල", "српски", "Slovensky", "slovenščina", @@ -142,6 +149,7 @@ static const char *const ppsz_language_text[] = "Türkçe", "украї́нська мо́ва", "tiếng Việt", + "Walon", }; #endif @@ -175,7 +183,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") @@ -340,7 +348,7 @@ static const char *const ppsz_force_dolby_descriptions[] = { "Protect against sound clipping" ) #define AUDIO_TIME_STRETCH_TEXT N_( \ - "Enable time streching audio" ) + "Enable time stretching audio" ) #define AUDIO_TIME_STRETCH_LONGTEXT N_( \ "This allows to play audio at lower or higher speed without " \ "affecting the audio pitch" ) @@ -636,8 +644,8 @@ static const char *const ppsz_pos_descriptions[] = #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)" ) + "This defines the maximum input delay jitter that the synchronization " \ + "algorithms should try to compensate (in milliseconds)." ) #define NETSYNC_TEXT N_("Network synchronisation" ) #define NETSYNC_LONGTEXT N_( "This allows you to remotely " \ @@ -837,24 +845,44 @@ static const char *const ppsz_clock_descriptions[] = "Load this subtitle file. To be used when autodetect cannot detect " \ "your subtitle file.") +/* DVD and VCD devices */ #define DVD_DEV_TEXT N_("DVD device") +#define VCD_DEV_TEXT N_("VCD device") +#define CDAUDIO_DEV_TEXT N_("Audio CD device") + #ifdef WIN32 -#define DVD_DEV_LONGTEXT N_( \ +# define DVD_DEV_LONGTEXT N_( \ "This is the default DVD drive (or file) to use. Don't forget the colon " \ - "after the drive letter (eg. D:)") + "after the drive letter (e.g. D:)") +# define VCD_DEV_LONGTEXT N_( \ + "This is the default VCD drive (or file) to use. Don't forget the colon " \ + "after the drive letter (e.g. D:)") +# define CDAUDIO_DEV_LONGTEXT N_( \ + "This is the default Audio CD drive (or file) to use. Don't forget the " \ + "colon after the drive letter (e.g. D:)") +# define DVD_DEVICE NULL +# define CD_DEVICE "D:" + #else -#define DVD_DEV_LONGTEXT N_( \ +# define DVD_DEV_LONGTEXT N_( \ "This is the default DVD device to use.") -#endif - -#define VCD_DEV_TEXT N_("VCD device") -#define VCD_DEV_LONGTEXT N_( \ +# define VCD_DEV_LONGTEXT N_( \ "This is the default VCD device to use." ) - -#define CDAUDIO_DEV_TEXT N_("Audio CD device") -#define CDAUDIO_DEV_LONGTEXT N_( \ +# define CDAUDIO_DEV_LONGTEXT N_( \ "This is the default Audio CD device to use." ) +# if defined(__OpenBSD__) +# define DVD_DEVICE "/dev/cd0c" +# define CD_DEVICE "/dev/cd0c" +# else +# define DVD_DEVICE "/dev/dvd" +# define CD_DEVICE "/dev/cdrom" +# endif +#endif + +#define VCD_DEVICE CD_DEVICE +#define CDAUDIO_DEVICE CD_DEVICE + #define IPV6_TEXT N_("Force IPv6") #define IPV6_LONGTEXT N_( \ "IPv6 will be used by default for all connections.") @@ -1222,7 +1250,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_( \ @@ -1253,6 +1281,10 @@ static const char *const ppsz_albumart_descriptions[] = "The media library is automatically saved and reloaded each time you " \ "start VLC." ) +#define LOAD_ML_TEXT N_( "Load Media Library" ) +#define LOAD_ML_LONGTEXT N_( \ + "Enable this option to load the SQL-based Media Library at VLC startup" ) + #define PLTREE_TEXT N_("Display playlist tree") #define PLTREE_LONGTEXT N_( \ "The playlist can use a tree to categorize some items, like the " \ @@ -1607,7 +1639,7 @@ vlc_module_begin () NULL, AUDIO_FILTER_TEXT, AUDIO_FILTER_LONGTEXT, false ) set_subcategory( SUBCAT_AUDIO_VISUAL ) - add_module( "audio-visual", "visualization",NULL, NULL,AUDIO_VISUAL_TEXT, + add_module( "audio-visual", "visualization2",NULL, NULL,AUDIO_VISUAL_TEXT, AUDIO_VISUAL_LONGTEXT, false ) /* Video options */ @@ -1636,6 +1668,9 @@ vlc_module_begin () add_string( "x11-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, true ) add_deprecated_alias( "xvideo-display" ) /* deprecated since 1.1.0 */ + add_deprecated_alias( "glx-display" ) + add_bool( "xlib", true, NULL, "", "", true ) + change_private () add_bool( "drop-late-frames", 1, NULL, DROP_LATE_FRAMES_TEXT, DROP_LATE_FRAMES_LONGTEXT, true ) /* Used in vout_synchro */ @@ -1651,6 +1686,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 ) @@ -1697,9 +1733,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 () @@ -1741,7 +1777,6 @@ vlc_module_begin () set_subcategory( SUBCAT_VIDEO_VFILTER ) add_module_list_cat( "video-filter", SUBCAT_VIDEO_VFILTER, NULL, NULL, VIDEO_FILTER_TEXT, VIDEO_FILTER_LONGTEXT, false ) - add_deprecated_alias( "filter" ) /*deprecated since 0.8.2 */ add_module_list_cat( "vout-filter", SUBCAT_VIDEO_VFILTER, NULL, NULL, VOUT_FILTER_TEXT, VOUT_FILTER_LONGTEXT, false ) #if 0 @@ -1776,7 +1811,6 @@ vlc_module_begin () SUB_PATH_TEXT, SUB_PATH_LONGTEXT, true ) add_integer( "sub-margin", 0, NULL, SUB_MARGIN_TEXT, SUB_MARGIN_LONGTEXT, true ) - add_deprecated_alias( "spu-margin" ) /*Deprecated since 0.8.2 */ set_section( N_( "Overlays" ) , NULL ) add_module_list_cat( "sub-filter", SUBCAT_VIDEO_SUBPIC, NULL, NULL, SUB_FILTER_TEXT, SUB_FILTER_LONGTEXT, false ) @@ -1795,11 +1829,9 @@ vlc_module_begin () add_integer( "audio-track", -1, NULL, INPUT_AUDIOTRACK_TEXT, INPUT_AUDIOTRACK_LONGTEXT, true ) 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 ) 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 ) @@ -1841,6 +1873,7 @@ vlc_module_begin () add_string( "bookmarks", NULL, NULL, BOOKMARKS_TEXT, BOOKMARKS_LONGTEXT, true ) + change_safe () set_section( N_( "Default devices") , NULL ) @@ -2076,8 +2109,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 ) @@ -2110,6 +2142,10 @@ vlc_module_begin () add_bool( "play-and-pause", 0, NULL, PAP_TEXT, PAP_LONGTEXT, true ) change_safe() add_bool( "media-library", 1, NULL, ML_TEXT, ML_LONGTEXT, false ) +#if defined( MEDIA_LIBRARY ) + add_bool( "load-media-library-on-startup", 1, NULL, LOAD_ML_TEXT, + LOAD_ML_LONGTEXT, false ) +#endif add_bool( "playlist-tree", 0, NULL, PLTREE_TEXT, PLTREE_LONGTEXT, false ) add_string( "open", "", NULL, OPEN_TEXT, OPEN_LONGTEXT, false ) @@ -2428,10 +2464,10 @@ vlc_module_begin () # define KEY_UNCROP_RIGHT KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'f' /* Zooming */ -# define KEY_ZOOM_QUARTER KEY_MODIFIER_CTRL|'1' -# define KEY_ZOOM_HALF KEY_MODIFIER_CTRL|'2' -# define KEY_ZOOM_ORIGINAL KEY_MODIFIER_CTRL|'3' -# define KEY_ZOOM_DOUBLE KEY_MODIFIER_CTRL|'4' +# define KEY_ZOOM_QUARTER KEY_MODIFIER_ALT|'1' +# define KEY_ZOOM_HALF KEY_MODIFIER_ALT|'2' +# define KEY_ZOOM_ORIGINAL KEY_MODIFIER_ALT|'3' +# define KEY_ZOOM_DOUBLE KEY_MODIFIER_ALT|'4' /* Bookmarks */ # define KEY_SET_BOOKMARK1 KEY_MODIFIER_CTRL|KEY_F1 @@ -2745,51 +2781,36 @@ 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 () - 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 ) */