X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.h;h=6511f44e430079ac8e72440cb634c7781ba285d0;hb=e3aaa2ff4777f99c594de1b6434879e3b2cf4c15;hp=2732b2dcc6d5bcf51841519079957fb52d7c7e4b;hpb=abfb521423455e8b518252ed08d084359f7faed0;p=vlc diff --git a/src/libvlc.h b/src/libvlc.h index 2732b2dcc6..6511f44e43 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -27,13 +27,10 @@ #include "vlc_keys.h" static char *ppsz_language[] = -{ "auto", "en", "en_GB", "bn", "ca", "da", "de", "el", "es", - "fr", "hi", "hu", "it", "ja", "my", "ne", "nl", "no", - "pl", "ps", "pt_BR", "ru", "sv", "tet", "tl", "zh_TW" }; +{ "auto", "en", "en_GB", "ca", "da", "de", "es", + "fr", "it", "ja", "nl", "pt_BR", "ru", "tr", "zh_TW" }; static char *ppsz_language_text[] = -{ N_("Auto"), N_("American"), N_("British"), N_("Bengali"), N_("Catalan"), N_("Danish"), N_("German"), N_("Greek"), N_("Spanish"), - N_("French"), N_("Hindi"), N_("Hungarian"), N_("Italian"), N_("Japanese"), N_("Burmese"), N_("Nepali"), N_("Dutch"), N_("Norwegian"), - N_("Polish"), N_("Pashto"), N_("Brazilian"), N_("Russian"), N_("Swedish"), N_("Tetum"), N_("Tagalog"), N_("Chinese Traditional") }; +{ N_("Auto"), N_("American English"), N_("British English"), N_("Catalan"), N_("Danish"), N_("German"), N_("Spanish"), N_("French"), N_("Italian"), N_("Japanese"), N_("Dutch"), N_("Brazilian Portuguese"), N_("Russian"), N_("Turkish"), N_("Chinese Traditional") }; static char *ppsz_snap_formats[] = { "png", "jpg" }; @@ -69,12 +66,16 @@ static char *ppsz_snap_formats[] = #define VERBOSE_TEXT N_("Verbosity (0,1,2)") #define VERBOSE_LONGTEXT N_( \ - "This options sets the verbosity level (0=only errors and " \ + "This option sets the verbosity level (0=only errors and " \ "standard messages, 1=warnings, 2=debug).") #define QUIET_TEXT N_("Be quiet") #define QUIET_LONGTEXT N_( \ - "This options turns off all warning and information messages.") + "This option turns off all warning and information messages.") + +#define OPEN_TEXT N_("Open MRL") +#define OPEN_LONGTEXT N_( \ + "This option allows you to open a default MRL on start-up.") #define LANGUAGE_TEXT N_("Language") #define LANGUAGE_LONGTEXT N_( "This option allows you to set the language " \ @@ -315,23 +316,23 @@ static char *ppsz_clock_descriptions[] = "multicast solution, you will probably have to indicate the IP address " \ "of your multicasting interface here.") -#define TTL_TEXT N_("Time to live") +#define TTL_TEXT N_("Time To Live") #define TTL_LONGTEXT N_( \ "Indicate here the Time To Live of the multicast packets sent by " \ "the stream output.") #define INPUT_PROGRAM_TEXT N_("Choose program (SID)") #define INPUT_PROGRAM_LONGTEXT N_( \ - "Choose the program to select by giving its Service ID\n." \ + "Choose the program to select by giving its Service ID.\n" \ "Only use this option if you want to read a multi-program stream " \ - "(like DVB streams for example )" ) + "(like DVB streams for example)." ) #define INPUT_PROGRAMS_TEXT N_("Choose programs") #define INPUT_PROGRAMS_LONGTEXT N_( \ "Choose the programs to select by giving a comma-separated list of " \ - "SIDs\n." \ + "SIDs.\n" \ "Only use this option if you want to read a multi-program stream " \ - "(like DVB streams for example )" ) + "(like DVB streams for example)." ) #define INPUT_AUDIOTRACK_TEXT N_("Choose audio track") #define INPUT_AUDIOTRACK_LONGTEXT N_( \ @@ -369,7 +370,8 @@ static char *ppsz_clock_descriptions[] = #define INPUT_SLAVE_TEXT N_("Input slave (experimental)") #define INPUT_SLAVE_LONGTEXT N_("Allows you to play from several files at " \ - "the same time. Experimental, not all formats are supported.") + "the same time. This feature is experimental, not all formats " \ + "are supported.") #define BOOKMARKS_TEXT N_("Bookmarks list for a stream") #define BOOKMARKS_LONGTEXT N_("You can specify a list of bookmarks for a stream in " \ @@ -463,6 +465,11 @@ static char *ppsz_clock_descriptions[] = "If you check this box, IPv4 will be used by default for all UDP and " \ "HTTP connections.") +#define TIMEOUT_TEXT N_("TCP connection timeout in ms") +#define TIMEOUT_LONGTEXT N_( \ + "Allows you to modify the default TCP connection timeout. This " \ + "value should be set in millisecond units." ) + #define SOCKS_SERVER_TEXT N_("SOCKS server") #define SOCKS_SERVER_LONGTEXT N_( \ "Allow you to specify a SOCKS server to use. It must be of the form " \ @@ -552,7 +559,7 @@ static char *ppsz_clock_descriptions[] = #define SOUT_AUDIO_TEXT N_("Enable audio stream output") #define SOUT_AUDIO_LONGTEXT N_( \ - "This allows you to choose if the video stream should be redirected to " \ + "This allows you to choose if the audio stream should be redirected to " \ "the stream output facility when this last one is enabled.") #define SOUT_KEEP_TEXT N_("Keep stream output open" ) @@ -628,8 +635,8 @@ static char *ppsz_clock_descriptions[] = #define SD_TEXT N_( "Services discovery modules") #define SD_LONGTEXT N_( \ - "Specifies the services discovery modules to load, separated by commas." \ - "Typical values are sap, hal, ..." ) + "Specifies the services discovery modules to load, separated by " \ + "semi-colons. Typical values are sap, hal, ..." ) #define RANDOM_TEXT N_("Play files randomly forever") #define RANDOM_LONGTEXT N_( \ @@ -716,6 +723,12 @@ static char *ppsz_clock_descriptions[] = "double-click on a file in the explorer. This option will allow you " \ "to play the file with the already running instance or enqueue it.") +#define PLAYLISTENQUEUE_TEXT N_( \ + "Enqueue items to playlist when in one instance mode") +#define PLAYLISTENQUEUE_LONGTEXT N_( \ + "When using the one instance only option, enqueue items to playlist " \ + "and keep playing current item.") + #define HPRIORITY_TEXT N_("Increase the priority of the process") #define HPRIORITY_LONGTEXT N_( \ "Increasing the priority of the process will very likely improve your " \ @@ -922,7 +935,6 @@ vlc_module_begin(); set_subcategory( SUBCAT_AUDIO_AOUT ); add_module( "aout", "audio output", NULL, NULL, AOUT_TEXT, AOUT_LONGTEXT, VLC_TRUE ); - change_short('A'); set_subcategory( SUBCAT_AUDIO_AFILTER ); add_module_list_cat( "audio-filter", SUBCAT_AUDIO_AFILTER, 0, NULL, AUDIO_FILTER_TEXT, @@ -943,7 +955,7 @@ vlc_module_begin(); FULLSCREEN_LONGTEXT, VLC_FALSE ); change_short('f'); add_bool( "skip-frames", 1, NULL, SKIP_FRAMES_TEXT, - SKIP_FRAMES_LONGTEXT, VLC_TRUE ); + SKIP_FRAMES_LONGTEXT, VLC_FALSE ); add_bool( "quiet-synchro", 0, NULL, QUIET_SYNCHRO_TEXT, QUIET_SYNCHRO_LONGTEXT, VLC_TRUE ); #ifndef SYS_DARWIN @@ -956,7 +968,7 @@ vlc_module_begin(); add_directory( "snapshot-path", NULL, NULL, SNAP_PATH_TEXT, SNAP_PATH_LONGTEXT, VLC_FALSE ); add_string( "snapshot-format", "png", NULL, SNAP_FORMAT_TEXT, - SNAP_FORMAT_LONGTEXT, VLC_TRUE ); + SNAP_FORMAT_LONGTEXT, VLC_FALSE ); change_string_list( ppsz_snap_formats, NULL, 0 ); set_section( N_("Window properties" ), NULL ); @@ -965,7 +977,7 @@ vlc_module_begin(); add_integer( "video-x", -1, NULL, VIDEOX_TEXT, VIDEOX_LONGTEXT, VLC_TRUE ); add_integer( "video-y", -1, NULL, VIDEOY_TEXT, VIDEOY_LONGTEXT, VLC_TRUE ); add_string( "aspect-ratio", "", NULL, - ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, VLC_TRUE ); + ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, VLC_FALSE ); add_bool( "video-deco", 1, NULL, VIDEO_DECO_TEXT, VIDEO_DECO_LONGTEXT, VLC_TRUE ); add_string( "video-title", NULL, NULL, VIDEO_TITLE_TEXT, @@ -983,7 +995,7 @@ vlc_module_begin(); set_subcategory( SUBCAT_VIDEO_VFILTER ); add_module_list_cat( "vout-filter", SUBCAT_VIDEO_VFILTER, NULL, NULL, FILTER_TEXT, FILTER_LONGTEXT, VLC_FALSE ); - + add_deprecated( "filter", VLC_FALSE ); /*deprecated since 0.8.2 */ #if 0 add_string( "pixel-ratio", "1", NULL, PIXEL_RATIO_TEXT, PIXEL_RATIO_TEXT ); #endif @@ -1010,7 +1022,7 @@ vlc_module_begin(); SUB_PATH_TEXT, SUB_PATH_LONGTEXT, VLC_TRUE ); add_integer( "sub-margin", -1, NULL, SUB_MARGIN_TEXT, SUB_MARGIN_LONGTEXT, VLC_TRUE ); - + add_deprecated( "spu-margin", VLC_FALSE ); /*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, VLC_TRUE ); @@ -1042,12 +1054,16 @@ vlc_module_begin(); INPUT_PROGRAMS_TEXT, INPUT_PROGRAMS_LONGTEXT, VLC_FALSE ); add_integer( "audio-track", -1, NULL, INPUT_AUDIOTRACK_TEXT, INPUT_AUDIOTRACK_LONGTEXT, VLC_FALSE ); + add_deprecated( "audio-channel", VLC_FALSE ); /*deprecated since 0.8.2 */ add_integer( "sub-track", -1, NULL, INPUT_SUBTRACK_TEXT, INPUT_SUBTRACK_LONGTEXT, VLC_FALSE ); + add_deprecated("spu-channel",VLC_FALSE); /*deprecated since 0.8.2*/ add_string( "audio-language", "", NULL, - INPUT_AUDIOTRACK_LANG_TEXT, INPUT_AUDIOTRACK_LANG_LONGTEXT, VLC_FALSE ); + INPUT_AUDIOTRACK_LANG_TEXT, INPUT_AUDIOTRACK_LANG_LONGTEXT, + VLC_FALSE ); add_string( "sub-language", "", NULL, - INPUT_SUBTRACK_LANG_TEXT, INPUT_SUBTRACK_LANG_LONGTEXT, VLC_FALSE ); + INPUT_SUBTRACK_LANG_TEXT, INPUT_SUBTRACK_LANG_LONGTEXT, + VLC_FALSE ); set_section( N_( "Playback control" ) , NULL); @@ -1085,6 +1101,8 @@ vlc_module_begin(); change_short('6'); add_bool( "ipv4", 0, NULL, IPV4_TEXT, IPV4_LONGTEXT, VLC_FALSE ); change_short('4'); + add_integer( "ipv4-timeout", 5 * 1000, NULL, TIMEOUT_TEXT, + TIMEOUT_LONGTEXT, VLC_TRUE ); set_section( N_( "Socks proxy") , NULL ) add_string( "socks", NULL, NULL, @@ -1189,6 +1207,7 @@ vlc_module_begin(); MEMCPY_LONGTEXT, VLC_TRUE ); add_module( "audio-channel-mixer", "audio mixer", NULL, NULL, AUDIO_CHANNEL_MIXER, AUDIO_CHANNEL_MIXER_LONGTEXT, VLC_TRUE ); + change_short('A'); set_section( N_("Plugins" ), NULL ); add_bool( "plugins-cache", VLC_TRUE, NULL, PLUGINS_CACHE_TEXT, @@ -1213,6 +1232,8 @@ vlc_module_begin(); #if defined(WIN32) add_bool( "one-instance", 0, NULL, ONEINSTANCE_TEXT, ONEINSTANCE_LONGTEXT, VLC_TRUE ); + add_bool( "playlist-enqueue", 0, NULL, PLAYLISTENQUEUE_TEXT, + PLAYLISTENQUEUE_LONGTEXT, VLC_TRUE ); add_bool( "high-priority", 0, NULL, HPRIORITY_TEXT, HPRIORITY_LONGTEXT, VLC_FALSE ); add_bool( "fast-mutex", 0, NULL, FAST_MUTEX_TEXT, @@ -1273,6 +1294,7 @@ vlc_module_begin(); add_bool( "color", 0, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE ); add_bool( "advanced", 0, NULL, ADVANCED_TEXT, ADVANCED_LONGTEXT, VLC_FALSE ); + add_string( "open", "", NULL, OPEN_TEXT, OPEN_LONGTEXT, VLC_FALSE ); set_subcategory( SUBCAT_INTERFACE_CONTROL ); add_module_list_cat( "control", SUBCAT_INTERFACE_CONTROL, NULL, NULL, @@ -1335,7 +1357,7 @@ vlc_module_begin(); # define KEY_QUIT KEY_MODIFIER_COMMAND|'q' # define KEY_VOL_UP KEY_MODIFIER_COMMAND|KEY_UP # define KEY_VOL_DOWN KEY_MODIFIER_COMMAND|KEY_DOWN -# define KEY_VOL_MUTE KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'m' +# define KEY_VOL_MUTE KEY_MODIFIER_COMMAND|KEY_MODIFIER_ALT|KEY_DOWN # define KEY_SUBDELAY_UP 'j' # define KEY_SUBDELAY_DOWN 'h' # define KEY_AUDIODELAY_UP 'g'