#include "vlc_keys.h"
static char *ppsz_language[] =
-{ "auto", "en", "en_GB", "es", "de",
- "fr", "hu", "it", "ja", "nl", "no",
- "pl", "pt_BR", "ru", "sv" };
+{ "auto", "en", "en_GB", "bn", "da", "de", "el", "es",
+ "fr", "hi", "hu", "it", "ja", "my", "ne", "nl", "no",
+ "pl", "ps", "pt_BR", "ru", "sv", "tet", "tl" };
static char *ppsz_language_text[] =
-{ N_("Auto"), N_("American"), N_("British"), N_("Spanish"), N_("German"),
- N_("French"), N_("Hungarian"), N_("Italian"), N_("Japanese"), N_("Dutch"),
- N_("Norwegian"), N_("Polish"), N_("Brazilian"), N_("Russian"),
- N_("Swedish") };
+{ N_("Auto"), N_("American"), N_("British"), N_("Bengali"), 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") };
+
+static char *ppsz_snap_formats[] =
+{ "png", "jpg" };
/*****************************************************************************
* Configuration options for the main program. Each module will also separatly
"interface. Use a comma separated list of interface modules. (common " \
"values are logger, gestures, sap, rc, http or screensaver)")
+#define CONTROL_TEXT N_("Control interfaces")
+#define CONTROL_LONGTEXT N_( \
+ "This option allows you to select control interfaces. " )
+
#define VERBOSE_TEXT N_("Verbosity (0,1,2)")
#define VERBOSE_LONGTEXT N_( \
"This options sets the verbosity level (0=only errors and " \
#define AUDIO_FILTER_TEXT N_("Audio filters")
#define AUDIO_FILTER_LONGTEXT N_( \
"This allows you to add audio post processing filters, to modify " \
- "the sound, or audio visualization modules (spectrum analyzer, etc.).")
+ "the sound" )
+
+#define AUDIO_VISUAL_TEXT N_("Audio visualizations ")
+#define AUDIO_VISUAL_LONGTEXT N_( \
+ "This allows you to add visualization modules " \
+ "(spectrum analyzer, etc.).")
#define AUDIO_CHANNEL_MIXER N_("Channel mixer")
#define AUDIO_CHANNEL_MIXER_LONGTEXT N_( \
#define VIDEO_ON_TOP_LONGTEXT N_("Always place the video window on top of " \
"other windows." )
+#define VIDEO_DECO_TEXT N_("Window decorations")
+#define VIDEO_DECO_LONGTEXT N_( \
+ "If this option is disabled, VLC will avoid creating window caption, " \
+ "frames, etc... around the video. Currently only supported on Windows.")
+
#define FILTER_TEXT N_("Video filter module")
#define FILTER_LONGTEXT N_( \
"This will allow you to add a post-processing filter to enhance the " \
"picture quality, for instance deinterlacing, or to clone or distort " \
"the video window.")
+#define SNAP_PATH_TEXT N_("Video snapshot directory")
+#define SNAP_PATH_LONGTEXT N_( \
+ "Allows you to specify the directory where the video snapshots will " \
+ "be stored.")
+
+#define SNAP_FORMAT_TEXT N_("Video snapshot format")
+#define SNAP_FORMAT_LONGTEXT N_( \
+ "Allows you to specify the image format in which the video snapshots will " \
+ "be stored.")
+
#define ASPECT_RATIO_TEXT N_("Source aspect ratio")
#define ASPECT_RATIO_LONGTEXT N_( \
"This will force the source aspect ratio. For instance, some DVDs claim " \
"aspect, or a float value (1.25, 1.3333, etc.) expressing pixel " \
"squareness.")
+#define SKIP_FRAMES_TEXT N_("Skip frames")
+#define SKIP_FRAMES_LONGTEXT N_( \
+ "Disable this option to disable frame drops on MPEG-2 streams.")
+
#define INPUT_CAT_LONGTEXT N_( \
"These options allow you to modify the behavior of the input " \
"subsystem, such as the DVD or VCD device, the network interface " \
"When using the PVR input (or a very irregular source), you should " \
"set this to 10000.")
-#define SERVER_PORT_TEXT N_("Server port")
+#define CLOCK_SYNCHRO_TEXT N_("Clock synchronisation")
+#define CLOCK_SYNCHRO_LONGTEXT N_( \
+ "Allows you to enable/disable the input clock synchronisation for " \
+ "real-time sources.")
+static int pi_clock_values[] = { -1, 0, 1 };
+static char *ppsz_clock_descriptions[] =
+{ N_("Default"), N_("Disable"), N_("Enable") };
+
+#define SERVER_PORT_TEXT N_("UDP port")
#define SERVER_PORT_LONGTEXT N_( \
"This is the port used for UDP streams. By default, we chose 1234.")
#define INPUT_PROGRAM_TEXT N_("Choose program (SID)")
#define INPUT_PROGRAM_LONGTEXT N_( \
- "Choose the program to select by giving its Service ID.")
+ "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 )" )
#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.")
+ "SIDs\n." \
+ "Only use this option if you want to read a multi-program stream " \
+ "(like DVB streams for example )" )
-#define INPUT_AUDIO_TEXT N_("Choose audio")
-#define INPUT_AUDIO_LONGTEXT N_( \
- "Give the default type of audio you want to use in a DVD. " \
- "(Developers only)")
-
-#define INPUT_CHAN_TEXT N_("Choose audio channel")
-#define INPUT_CHAN_LONGTEXT N_( \
- "Give the stream number of the audio channel you want to use in a DVD " \
+#define INPUT_AUDIOTRACK_TEXT N_("Choose audio track")
+#define INPUT_AUDIOTRACK_LONGTEXT N_( \
+ "Give the stream number of the audio track you want to use" \
"(from 0 to n).")
-#define INPUT_SUB_TEXT N_("Choose subtitle track")
-#define INPUT_SUB_LONGTEXT N_( \
- "Give the stream number of the subtitle channel you want to use " \
+#define INPUT_SUBTRACK_TEXT N_("Choose subtitles track")
+#define INPUT_SUBTRACK_LONGTEXT N_( \
+ "Give the stream number of the subtitle track you want to use " \
"(from 0 to n).")
-#define INPUT_REPEAT_TEXT N_("Number of time the same input will be repeated")
-#define INPUT_REPEAT_LONGTEXT N_("Number of time the same input will be repeated")
+#define INPUT_AUDIOTRACK_LANG_TEXT N_("Choose audio language")
+#define INPUT_AUDIOTRACK_LANG_LONGTEXT N_( \
+ "Give the language of the audio track you want to use " \
+ "(comma separted, two or tree letter country code).")
+
+#define INPUT_SUBTRACK_LANG_TEXT N_("Choose subtitle language")
+#define INPUT_SUBTRACK_LANG_LONGTEXT N_( \
+ "Give the language of the subtitle track you want to use " \
+ "(comma separted, two or tree letter country code).")
+
+#define INPUT_REPEAT_TEXT N_("Input repetitions")
+#define INPUT_REPEAT_LONGTEXT N_("Number of time the same input will be " \
+ "repeated")
#define START_TIME_TEXT N_("Input start time (seconds)")
#define START_TIME_LONGTEXT N_("Input start time (seconds)")
#define STOP_TIME_TEXT N_("Input stop time (seconds)")
#define STOP_TIME_LONGTEXT N_("Input stop time (seconds)")
+#define INPUT_LIST_TEXT N_("Input list")
+#define INPUT_LIST_LONGTEXT N_("Allows you to specify a comma-separated list " \
+ "of inputs that will be concatenated.")
+
#define INPUT_SLAVE_TEXT N_("Input slave (experimental)")
-#define INPUT_SLAVE_LONGTEXT 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.")
#define BOOKMARKS_TEXT N_("Bookmarks list for a stream")
#define BOOKMARKS_LONGTEXT N_("You can specify a list of bookmarks for a stream in " \
"\"subpictures filters\" modules section. You can also set many " \
"miscellaneous subpictures options." )
-#define SPUMARGIN_TEXT N_("Force SPU position")
-#define SPUMARGIN_LONGTEXT N_( \
+#define SUB_MARGIN_TEXT N_("Force subtitle position")
+#define SUB_MARGIN_LONGTEXT N_( \
"You can use this option to place the subtitles under the movie, " \
"instead of over the movie. Try several positions.")
"If you check this box, IPv4 will be used by default for all UDP and " \
"HTTP connections.")
+#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 " \
+ "address:port . It will be used for all TCP connections" )
+
+#define SOCKS_USER_TEXT N_("SOCKS user name")
+#define SOCKS_USER_LONGTEXT N_("Allows you to modify the user name that will " \
+ "be used for the connection to the SOCKS server.")
+
+#define SOCKS_PASS_TEXT N_("SOCKS password")
+#define SOCKS_PASS_LONGTEXT N_("Allows you to modify the password that will " \
+ "be used for the connection to the SOCKS server.")
+
+
+
+
#define META_TITLE_TEXT N_("Title metadata")
#define META_TITLE_LONGTEXT N_( \
"Allows you to specify a \"title\" metadata for an input.")
"These options allow you to set default global options for the " \
"stream output subsystem." )
-#define SOUT_TEXT N_("Choose a stream output")
+#define SOUT_TEXT N_("Default stream output chain")
#define SOUT_LONGTEXT N_( \
- "Empty if no stream output.")
+ "You can enter here a default stream output chain. Refer to "\
+ "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")
#define SOUT_ALL_LONGTEXT N_( \
"When selected, VLC will randomly play files in the playlist until " \
"interrupted.")
-#define LOOP_TEXT N_("Loop playlist on end")
+#define LOOP_TEXT N_("Repeat all")
#define LOOP_LONGTEXT N_( \
"If you want VLC to keep playing the playlist indefinitely then enable " \
"this option.")
-#define REPEAT_TEXT N_("Repeat the current item")
+#define REPEAT_TEXT N_("Repeat current item")
#define REPEAT_LONGTEXT N_( \
"When this is active, VLC will keep playing the current playlist item " \
"over and over again.")
#define PAS_TEXT N_("Play and stop")
#define PAS_LONGTEXT N_( \
- "Stop the playlist after each played playlist item. " \
- "Does advance the playlist index.")
+ "Stop the playlist after each played playlist item. " )
#define MISC_CAT_LONGTEXT N_( \
"These options allow you to select default modules. Leave these " \
"This option allows you to specify an additional path for VLC to look " \
"for its modules.")
+#define VLM_CONF_TEXT N_("VLM configuration file")
+#define VLM_CONF_LONGTEXT N_( \
+ "This option allows you to specify a VLM configuration file that will " \
+ "be read when VLM is launched.")
+
#define PLUGINS_CACHE_TEXT N_("Use a plugins cache")
#define PLUGINS_CACHE_LONGTEXT N_( \
"This option allows you to use a plugins cache which will greatly " \
#define SUBDELAY_UP_KEY_LONGTEXT N_("Select the key to increase the subtitle delay.")
#define SUBDELAY_DOWN_KEY_TEXT N_("Subtitle delay down")
#define SUBDELAY_DOWN_KEY_LONGTEXT N_("Select the key to decrease the subtitle delay.")
+#define AUDIODELAY_UP_KEY_TEXT N_("Audio delay up")
+#define AUDIODELAY_UP_KEY_LONGTEXT N_("Select the key to increase the audio delay.")
+#define AUDIODELAY_DOWN_KEY_TEXT N_("Audio delay down")
+#define AUDIODELAY_DOWN_KEY_LONGTEXT N_("Select the key to decrease the audio delay.")
#define PLAY_BOOKMARK1_KEY_TEXT N_("Play playlist bookmark 1")
#define PLAY_BOOKMARK2_KEY_TEXT N_("Play playlist bookmark 2")
#define PLAY_BOOKMARK3_KEY_TEXT N_("Play playlist bookmark 3")
#define SUBTITLE_TRACK_KEY_LONGTEXT N_("Cycle through the available subtitle tracks")
#define INTF_SHOW_KEY_TEXT N_("Show interface")
#define INTF_SHOW_KEY_LONGTEXT N_("Raise the interface above all other windows")
+#define SNAP_KEY_TEXT N_("Take video snapshot")
+#define SNAP_KEY_LONGTEXT N_("Takes a video snapshot and writes it to disk.")
#define PLAYLIST_USAGE N_( \
"\nPlaylist MRL syntax:" \
* N_(text), N_(longtext) );
* add_integer( option_name, i_value, p_callback, N_(text), N_(longtext),
b_advanced_option );
- * add_bool( option_name, b_value, p_callback, N_(text), N_(longtext),
+ * add_bool( option_name, b_value, p_callback, N_(text), N_(longtext),
b_advanced_option );
*/
vlc_module_begin();
- /* Interface options */
- add_category_hint( N_("Interface"), INTF_CAT_LONGTEXT , VLC_FALSE );
- add_module( "intf", "interface", NULL, NULL, INTF_TEXT,
- INTF_LONGTEXT, VLC_FALSE );
- change_short('I');
- add_string( "extraintf", NULL, NULL, EXTRAINTF_TEXT,
- EXTRAINTF_LONGTEXT, VLC_FALSE );
- add_integer( "verbose", 0, NULL, VERBOSE_TEXT, VERBOSE_LONGTEXT,
- VLC_FALSE );
- change_short('v');
- add_bool( "quiet", 0, NULL, QUIET_TEXT, QUIET_LONGTEXT, VLC_TRUE );
- change_short('q');
- add_string( "language", "auto", NULL, LANGUAGE_TEXT, LANGUAGE_LONGTEXT,
- VLC_FALSE );
- change_string_list( ppsz_language, ppsz_language_text, 0 );
- add_bool( "color", 0, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE );
- add_bool( "advanced", 0, NULL, ADVANCED_TEXT,
- ADVANCED_LONGTEXT, VLC_FALSE );
-
/* Audio options */
- add_category_hint( N_("Audio"), AOUT_CAT_LONGTEXT , VLC_FALSE );
- add_module( "aout", "audio output", NULL, NULL, AOUT_TEXT, AOUT_LONGTEXT,
- VLC_TRUE );
- change_short('A');
+ set_category( CAT_AUDIO );
+ set_subcategory( SUBCAT_AUDIO_GENERAL );
add_bool( "audio", 1, NULL, AUDIO_TEXT, AUDIO_LONGTEXT, VLC_FALSE );
add_integer_with_range( "volume", AOUT_VOLUME_DEFAULT, AOUT_VOLUME_MIN,
AOUT_VOLUME_MAX, NULL, VOLUME_TEXT,
VOLUME_LONGTEXT, VLC_FALSE );
- add_integer_with_range( "saved-volume", AOUT_VOLUME_DEFAULT,
- AOUT_VOLUME_MIN, AOUT_VOLUME_MAX, NULL,
- VOLUME_SAVE_TEXT, VOLUME_SAVE_LONGTEXT, VLC_TRUE );
add_integer( "aout-rate", -1, NULL, AOUT_RATE_TEXT,
AOUT_RATE_LONGTEXT, VLC_TRUE );
#if !defined( SYS_DARWIN )
add_bool( "spdif", 0, NULL, SPDIF_TEXT, SPDIF_LONGTEXT, VLC_FALSE );
add_integer( "audio-desync", 0, NULL, DESYNC_TEXT,
DESYNC_LONGTEXT, VLC_TRUE );
- add_string( "audio-filter", 0, NULL,AUDIO_FILTER_TEXT,
- AUDIO_FILTER_LONGTEXT, VLC_FALSE );
- add_module( "audio-channel-mixer", "audio filter", NULL, NULL,
- AUDIO_CHANNEL_MIXER, AUDIO_CHANNEL_MIXER_LONGTEXT, VLC_FALSE );
+ set_subcategory( SUBCAT_AUDIO_AOUT );
+ add_module( "aout", "audio output", NULL, NULL, AOUT_TEXT, AOUT_LONGTEXT,
+ VLC_TRUE );
+ set_subcategory( SUBCAT_AUDIO_AFILTER );
+ add_module_list_cat( "audio-filter", SUBCAT_AUDIO_AFILTER, 0,
+ NULL, AUDIO_FILTER_TEXT,
+ AUDIO_FILTER_LONGTEXT, VLC_FALSE );
+ set_subcategory( SUBCAT_AUDIO_VISUAL );
+ add_module( "audio-visual", "visualization",NULL, NULL,AUDIO_VISUAL_TEXT,
+ AUDIO_VISUAL_LONGTEXT, VLC_FALSE );
/* Video options */
- add_category_hint( N_("Video"), VOUT_CAT_LONGTEXT , VLC_FALSE );
- add_module( "vout", "video output", NULL, NULL, VOUT_TEXT, VOUT_LONGTEXT,
- VLC_TRUE );
- change_short('V');
+ set_category( CAT_VIDEO );
+ set_subcategory( SUBCAT_VIDEO_GENERAL );
add_bool( "video", 1, NULL, VIDEO_TEXT, VIDEO_LONGTEXT, VLC_TRUE );
+ add_bool( "grayscale", 0, NULL, GRAYSCALE_TEXT,
+ GRAYSCALE_LONGTEXT, VLC_FALSE );
+ add_bool( "fullscreen", 0, NULL, FULLSCREEN_TEXT,
+ FULLSCREEN_LONGTEXT, VLC_FALSE );
+ change_short('f');
+ add_bool( "skip-frames", 1, NULL, SKIP_FRAMES_TEXT,
+ SKIP_FRAMES_LONGTEXT, VLC_TRUE );
+#ifndef SYS_DARWIN
+ add_bool( "overlay", 1, NULL, OVERLAY_TEXT, OVERLAY_LONGTEXT, VLC_TRUE );
+#endif
+ add_bool( "video-on-top", 0, NULL, VIDEO_ON_TOP_TEXT,
+ VIDEO_ON_TOP_LONGTEXT, VLC_FALSE );
+
+ set_section( N_("Snapshot") , NULL );
+ 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 );
+ change_string_list( ppsz_snap_formats, NULL, 0 );
+
+ set_section( N_("Window properties" ), NULL );
add_integer( "width", -1, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, VLC_TRUE );
add_integer( "height", -1, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, VLC_TRUE );
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 );
+ add_bool( "video-deco", 1, NULL, VIDEO_DECO_TEXT,
+ VIDEO_DECO_LONGTEXT, VLC_TRUE );
add_string( "video-title", NULL, NULL, VIDEO_TITLE_TEXT,
VIDEO_TITLE_LONGTEXT, VLC_TRUE );
add_integer( "align", 0, NULL, ALIGN_TEXT, ALIGN_LONGTEXT, VLC_TRUE );
change_integer_list( pi_align_values, ppsz_align_descriptions, 0 );
add_float( "zoom", 1, NULL, ZOOM_TEXT, ZOOM_LONGTEXT, VLC_TRUE );
- add_bool( "grayscale", 0, NULL, GRAYSCALE_TEXT,
- GRAYSCALE_LONGTEXT, VLC_TRUE );
- add_bool( "fullscreen", 0, NULL, FULLSCREEN_TEXT,
- FULLSCREEN_LONGTEXT, VLC_FALSE );
- change_short('f');
-#ifndef SYS_DARWIN
- add_bool( "overlay", 1, NULL, OVERLAY_TEXT, OVERLAY_LONGTEXT, VLC_TRUE );
-#endif
- add_bool( "video-on-top", 0, NULL, VIDEO_ON_TOP_TEXT,
- VIDEO_ON_TOP_LONGTEXT, VLC_FALSE );
- add_module( "filter", "video filter", NULL, NULL,
+
+ set_subcategory( SUBCAT_VIDEO_VOUT );
+ add_module( "vout", "video output", NULL, NULL, VOUT_TEXT, VOUT_LONGTEXT,
+ VLC_TRUE );
+ change_short('V');
+
+ set_subcategory( SUBCAT_VIDEO_VFILTER );
+ add_module_list_cat( "filter", SUBCAT_VIDEO_VFILTER, NULL, NULL,
FILTER_TEXT, FILTER_LONGTEXT, VLC_FALSE );
- add_string( "aspect-ratio", "", NULL,
- ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, VLC_TRUE );
+
#if 0
add_string( "pixel-ratio", "1", NULL, PIXEL_RATIO_TEXT, PIXEL_RATIO_TEXT );
#endif
/* Subpictures options */
- add_category_hint( N_("Subpictures"), SUB_CAT_LONGTEXT , VLC_FALSE );
+ set_subcategory( SUBCAT_VIDEO_SUBPIC );
+ set_section( N_("On Screen Display") , NULL );
add_bool( "osd", 1, NULL, OSD_TEXT, OSD_LONGTEXT, VLC_FALSE );
+
+ set_section( N_("Subtitles") , NULL );
+ add_file( "sub-file", NULL, NULL, SUB_FILE_TEXT,
+ SUB_FILE_LONGTEXT, VLC_FALSE );
add_bool( "sub-autodetect-file", VLC_TRUE, NULL,
SUB_AUTO_TEXT, SUB_AUTO_LONGTEXT, VLC_FALSE );
add_integer( "sub-autodetect-fuzzy", 3, NULL,
#endif
add_string( "sub-autodetect-path", SUB_PATH, NULL,
SUB_PATH_TEXT, SUB_PATH_LONGTEXT, VLC_TRUE );
- add_file( "sub-file", NULL, NULL, SUB_FILE_TEXT,
- SUB_FILE_LONGTEXT, VLC_TRUE );
- add_integer( "spumargin", -1, NULL, SPUMARGIN_TEXT,
- SPUMARGIN_LONGTEXT, VLC_TRUE );
- add_module( "sub-filter", "sub filter", NULL, NULL,
+ add_integer( "sub-margin", -1, NULL, SUB_MARGIN_TEXT,
+ SUB_MARGIN_LONGTEXT, VLC_TRUE );
+
+ set_section( N_( "Overlays" ) , NULL );
+ add_module_list_cat( "sub-filter", SUBCAT_VIDEO_SUBPIC, NULL, NULL,
SUB_FILTER_TEXT, SUB_FILTER_LONGTEXT, VLC_TRUE );
/* Input options */
- add_category_hint( N_("Input"), INPUT_CAT_LONGTEXT , VLC_FALSE );
- add_integer( "cr-average", 40, NULL, CR_AVERAGE_TEXT,
- CR_AVERAGE_LONGTEXT, VLC_FALSE );
- add_integer( "server-port", 1234, NULL,
- SERVER_PORT_TEXT, SERVER_PORT_LONGTEXT, VLC_FALSE );
- add_integer( "mtu", 1500, NULL, MTU_TEXT, MTU_LONGTEXT, VLC_TRUE );
- add_string( "iface-addr", "", NULL, IFACE_ADDR_TEXT,
- IFACE_ADDR_LONGTEXT, VLC_TRUE );
+ set_category( CAT_INPUT );
+ set_subcategory( SUBCAT_INPUT_ACCESS );
+ add_module( "access", "access2", NULL, NULL, ACCESS_TEXT,
+ ACCESS_LONGTEXT, VLC_TRUE );
+ set_subcategory( SUBCAT_INPUT_DEMUX );
+ add_module( "demux", "demux2", NULL, NULL, DEMUX_TEXT,
+ DEMUX_LONGTEXT, VLC_TRUE );
+ set_subcategory( SUBCAT_INPUT_VCODEC );
+ set_subcategory( SUBCAT_INPUT_ACODEC );
+ set_subcategory( SUBCAT_INPUT_SCODEC );
+ set_subcategory( SUBCAT_INPUT_ADVANCED );
+ set_section( N_( "Track settings" ), NULL );
add_integer( "program", 0, NULL,
INPUT_PROGRAM_TEXT, INPUT_PROGRAM_LONGTEXT, VLC_TRUE );
add_string( "programs", "", NULL,
INPUT_PROGRAMS_TEXT, INPUT_PROGRAMS_LONGTEXT, VLC_FALSE );
- add_integer( "audio-type", -1, NULL,
- INPUT_AUDIO_TEXT, INPUT_AUDIO_LONGTEXT, VLC_TRUE );
- add_integer( "audio-channel", -1, NULL,
- INPUT_CHAN_TEXT, INPUT_CHAN_LONGTEXT, VLC_FALSE );
- add_integer( "spu-channel", -1, NULL,
- INPUT_SUB_TEXT, INPUT_SUB_LONGTEXT, VLC_FALSE );
+ add_integer( "audio-track", -1, NULL,
+ INPUT_AUDIOTRACK_TEXT, INPUT_AUDIOTRACK_LONGTEXT, VLC_FALSE );
+ add_integer( "sub-track", -1, NULL,
+ INPUT_SUBTRACK_TEXT, INPUT_SUBTRACK_LONGTEXT, VLC_FALSE );
+ add_string( "audio-language", "", NULL,
+ 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 );
+
+
+ set_section( N_( "Playback control" ) , NULL);
add_integer( "input-repeat", 0, NULL,
INPUT_REPEAT_TEXT, INPUT_REPEAT_LONGTEXT, VLC_TRUE );
add_integer( "start-time", 0, NULL,
START_TIME_TEXT, START_TIME_LONGTEXT, VLC_TRUE );
add_integer( "stop-time", 0, NULL,
STOP_TIME_TEXT, STOP_TIME_LONGTEXT, VLC_TRUE );
+ add_string( "input-list", NULL, NULL,
+ INPUT_LIST_TEXT, INPUT_LIST_LONGTEXT, VLC_TRUE );
add_string( "input-slave", NULL, NULL,
INPUT_SLAVE_TEXT, INPUT_SLAVE_LONGTEXT, VLC_TRUE );
add_string( "bookmarks", NULL, NULL,
BOOKMARKS_TEXT, BOOKMARKS_LONGTEXT, VLC_TRUE );
+ set_section( N_( "Default devices") , NULL )
+
add_file( "dvd", DVD_DEVICE, NULL, DVD_DEV_TEXT, DVD_DEV_LONGTEXT,
VLC_FALSE );
add_file( "vcd", VCD_DEVICE, NULL, VCD_DEV_TEXT, VCD_DEV_LONGTEXT,
add_file( "cd-audio", CDAUDIO_DEVICE, NULL, CDAUDIO_DEV_TEXT,
CDAUDIO_DEV_LONGTEXT, VLC_FALSE );
+ set_section( N_( "Network settings" ), NULL );
+
+ add_integer( "server-port", 1234, NULL,
+ SERVER_PORT_TEXT, SERVER_PORT_LONGTEXT, VLC_FALSE );
+ add_integer( "mtu", 1500, NULL, MTU_TEXT, MTU_LONGTEXT, VLC_TRUE );
+ add_string( "iface-addr", "", NULL, IFACE_ADDR_TEXT,
+ IFACE_ADDR_LONGTEXT, VLC_TRUE );
add_bool( "ipv6", 0, NULL, IPV6_TEXT, IPV6_LONGTEXT, VLC_FALSE );
change_short('6');
add_bool( "ipv4", 0, NULL, IPV4_TEXT, IPV4_LONGTEXT, VLC_FALSE );
change_short('4');
+ set_section( N_( "Socks proxy") , NULL )
+ add_string( "socks", NULL, NULL,
+ SOCKS_SERVER_TEXT, SOCKS_SERVER_LONGTEXT, VLC_TRUE );
+ add_string( "socks-user", NULL, NULL,
+ SOCKS_USER_TEXT, SOCKS_USER_LONGTEXT, VLC_TRUE );
+ add_string( "socks-pwd", NULL, NULL,
+ SOCKS_PASS_TEXT, SOCKS_PASS_LONGTEXT, VLC_TRUE );
+
+
+ set_section( N_("Metadata" ) , NULL )
add_string( "meta-title", NULL, NULL, META_TITLE_TEXT,
META_TITLE_LONGTEXT, VLC_TRUE );
add_string( "meta-author", NULL, NULL, META_AUTHOR_TEXT,
add_string( "meta-url", NULL, NULL, META_URL_TEXT,
META_URL_LONGTEXT, VLC_TRUE );
+ set_section( N_( "Advanced" ), NULL );
+
+ add_integer( "cr-average", 40, NULL, CR_AVERAGE_TEXT,
+ CR_AVERAGE_LONGTEXT, VLC_FALSE );
+ add_integer( "clock-synchro", -1, NULL, CLOCK_SYNCHRO_TEXT,
+ CLOCK_SYNCHRO_LONGTEXT, VLC_FALSE );
+ change_integer_list( pi_clock_values, ppsz_clock_descriptions, 0 );
+
/* Decoder options */
add_category_hint( N_("Decoders"), CODEC_CAT_LONGTEXT , VLC_TRUE );
- add_module( "codec", "decoder", NULL, NULL, CODEC_TEXT,
+ add_string( "codec", NULL, NULL, CODEC_TEXT,
CODEC_LONGTEXT, VLC_TRUE );
- add_module( "encoder", "encoder", NULL, NULL, ENCODER_TEXT,
+ add_string( "encoder", NULL, NULL, ENCODER_TEXT,
ENCODER_LONGTEXT, VLC_TRUE );
/* Stream output options */
+ set_category( CAT_SOUT );
+ set_subcategory( SUBCAT_SOUT_GENERAL );
add_category_hint( N_("Stream output"), SOUT_CAT_LONGTEXT , VLC_TRUE );
+
add_string( "sout", NULL, NULL, SOUT_TEXT, SOUT_LONGTEXT, VLC_TRUE );
add_bool( "sout-display", VLC_FALSE, NULL, SOUT_DISPLAY_TEXT,
SOUT_DISPLAY_LONGTEXT, VLC_TRUE );
SOUT_AUDIO_LONGTEXT, VLC_TRUE );
add_bool( "sout-video", 1, NULL, SOUT_VIDEO_TEXT,
SOUT_VIDEO_LONGTEXT, VLC_TRUE );
+ add_integer( "ttl", 1, NULL, TTL_TEXT, TTL_LONGTEXT, VLC_TRUE );
- add_module( "packetizer", "packetizer", NULL, NULL,
- PACKETIZER_TEXT, PACKETIZER_LONGTEXT, VLC_TRUE );
+ set_subcategory( SUBCAT_SOUT_STREAM );
+ set_subcategory( SUBCAT_SOUT_MUX );
add_module( "mux", "sout mux", NULL, NULL, MUX_TEXT,
MUX_LONGTEXT, VLC_TRUE );
+ set_subcategory( SUBCAT_SOUT_ACO );
add_module( "access_output", "sout access", NULL, NULL,
ACCESS_OUTPUT_TEXT, ACCESS_OUTPUT_LONGTEXT, VLC_TRUE );
- add_integer( "ttl", 1, NULL, TTL_TEXT, TTL_LONGTEXT, VLC_TRUE );
+ set_subcategory( SUBCAT_SOUT_PACKETIZER );
+ add_module( "packetizer","packetizer", NULL, NULL,
+ PACKETIZER_TEXT, PACKETIZER_LONGTEXT, VLC_TRUE );
+ set_subcategory( SUBCAT_SOUT_SAP );
add_bool( "sap-flow-control", VLC_FALSE, NULL, ANN_SAPCTRL_TEXT,
ANN_SAPCTRL_LONGTEXT, VLC_TRUE );
add_integer( "sap-interval", 5, NULL, ANN_SAPINTV_TEXT,
ANN_SAPINTV_LONGTEXT, VLC_TRUE );
+ set_subcategory( SUBCAT_SOUT_VOD );
/* CPU options */
- add_category_hint( N_("CPU"), CPU_CAT_LONGTEXT, VLC_TRUE );
+ set_category( CAT_ADVANCED );
+ set_subcategory( SUBCAT_ADVANCED_CPU );
#if defined( __i386__ )
add_bool( "mmx", 1, NULL, MMX_TEXT, MMX_LONGTEXT, VLC_TRUE );
add_bool( "3dn", 1, NULL, THREE_DN_TEXT, THREE_DN_LONGTEXT, VLC_TRUE );
#if defined( __powerpc__ ) || defined( SYS_DARWIN )
add_bool( "altivec", 1, NULL, ALTIVEC_TEXT, ALTIVEC_LONGTEXT, VLC_TRUE );
#endif
-
- /* Playlist options */
- add_category_hint( N_("Playlist"), PLAYLIST_CAT_LONGTEXT , VLC_FALSE );
- add_string( "services-discovery", 0, NULL,
- SD_TEXT, SD_LONGTEXT, VLC_FALSE );
- change_short('S');
- add_bool( "random", 0, NULL, RANDOM_TEXT, RANDOM_LONGTEXT, VLC_FALSE );
- change_short('Z');
- add_bool( "loop", 0, NULL, LOOP_TEXT, LOOP_LONGTEXT, VLC_FALSE );
- change_short('L');
- add_bool( "repeat", 0, NULL, REPEAT_TEXT, REPEAT_LONGTEXT, VLC_TRUE );
- change_short('R');
- add_bool( "play-and-stop", 0, NULL, PAS_TEXT, PAS_LONGTEXT, VLC_TRUE );
-
/* Misc options */
- add_category_hint( N_("Miscellaneous"), MISC_CAT_LONGTEXT, VLC_TRUE );
+ set_subcategory( SUBCAT_ADVANCED_MISC );
+ set_section( N_("Special modules"), NULL );
add_module( "memcpy", "memcpy", NULL, NULL, MEMCPY_TEXT,
MEMCPY_LONGTEXT, VLC_TRUE );
- add_module( "access", "access", NULL, NULL, ACCESS_TEXT,
- ACCESS_LONGTEXT, VLC_TRUE );
- add_module( "demux", "demux", NULL, NULL, DEMUX_TEXT,
- DEMUX_LONGTEXT, VLC_TRUE );
- add_bool( "minimize-threads", 0, NULL, MINIMIZE_THREADS_TEXT,
- MINIMIZE_THREADS_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,
PLUGINS_CACHE_LONGTEXT, VLC_TRUE );
add_directory( "plugin-path", NULL, NULL, PLUGIN_PATH_TEXT,
PLUGIN_PATH_LONGTEXT, VLC_TRUE );
-#if !defined(WIN32)
- add_bool( "daemon", 0, NULL, DAEMON_TEXT, DAEMON_LONGTEXT, VLC_TRUE );
- change_short('d');
-#endif
+ set_section( N_("Performance options"), NULL );
+ add_bool( "minimize-threads", 0, NULL, MINIMIZE_THREADS_TEXT,
+ MINIMIZE_THREADS_LONGTEXT, VLC_TRUE );
#if !defined(SYS_DARWIN) && !defined(SYS_BEOS) && defined(PTHREAD_COND_T_IN_PTHREAD_H)
add_bool( "rt-priority", 0, NULL, RT_PRIORITY_TEXT,
WIN9X_CV_LONGTEXT, VLC_TRUE );
#endif
+ set_section( N_("Miscellaneous" ), NULL );
+ add_string( "vlm-conf", NULL, NULL, VLM_CONF_TEXT,
+ VLM_CONF_LONGTEXT, VLC_TRUE );
+
+#if !defined(WIN32)
+ add_bool( "daemon", 0, NULL, DAEMON_TEXT, DAEMON_LONGTEXT, VLC_TRUE );
+ change_short('d');
+#endif
+
+ /* Playlist options */
+ set_category( CAT_PLAYLIST );
+ set_subcategory( SUBCAT_PLAYLIST_GENERAL );
+ add_category_hint( N_("Playlist"), PLAYLIST_CAT_LONGTEXT , VLC_FALSE );
+ add_bool( "random", 0, NULL, RANDOM_TEXT, RANDOM_LONGTEXT, VLC_FALSE );
+ change_short('Z');
+ add_bool( "loop", 0, NULL, LOOP_TEXT, LOOP_LONGTEXT, VLC_FALSE );
+ change_short('L');
+ add_bool( "repeat", 0, NULL, REPEAT_TEXT, REPEAT_LONGTEXT, VLC_FALSE );
+ change_short('R');
+ add_bool( "play-and-stop", 0, NULL, PAS_TEXT, PAS_LONGTEXT, VLC_FALSE );
+
+ set_subcategory( SUBCAT_PLAYLIST_SD );
+ add_module_list_cat( "services-discovery", SUBCAT_PLAYLIST_SD, NULL,
+ NULL, SD_TEXT, SD_LONGTEXT, VLC_FALSE );
+ change_short('S');
+
+ /* Interface options */
+ set_category( CAT_INTERFACE );
+ set_subcategory( SUBCAT_INTERFACE_GENERAL );
+
+ set_section ( N_("Interface module" ), NULL );
+ add_module_cat( "intf", SUBCAT_INTERFACE_GENERAL, NULL, NULL, INTF_TEXT,
+ INTF_LONGTEXT, VLC_FALSE );
+ change_short('I');
+
+ set_section ( N_("Extra interface modules" ), NULL );
+ add_module_list_cat( "extraintf", SUBCAT_INTERFACE_GENERAL,
+ NULL, NULL, EXTRAINTF_TEXT,
+ EXTRAINTF_LONGTEXT, VLC_FALSE );
+
+ set_section ( N_("Miscellaneous"), NULL );
+ add_integer( "verbose", 0, NULL, VERBOSE_TEXT, VERBOSE_LONGTEXT,
+ VLC_FALSE );
+ change_short('v');
+ add_bool( "quiet", 0, NULL, QUIET_TEXT, QUIET_LONGTEXT, VLC_TRUE );
+ change_short('q');
+ add_string( "language", "auto", NULL, LANGUAGE_TEXT, LANGUAGE_LONGTEXT,
+ VLC_FALSE );
+ change_string_list( ppsz_language, ppsz_language_text, 0 );
+ add_bool( "color", 0, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE );
+ add_bool( "advanced", 0, NULL, ADVANCED_TEXT, ADVANCED_LONGTEXT,
+ VLC_FALSE );
+
+ set_subcategory( SUBCAT_INTERFACE_CONTROL );
+ add_module_list_cat( "control", SUBCAT_INTERFACE_CONTROL, NULL, NULL,
+ CONTROL_TEXT, CONTROL_LONGTEXT, VLC_FALSE );
+
/* Hotkey options*/
+ set_subcategory( SUBCAT_INTERFACE_HOTKEYS );
add_category_hint( N_("Hot keys"), HOTKEY_CAT_LONGTEXT , VLC_FALSE );
#if defined(SYS_DARWIN)
+/* Don't use the following combo's */
+
+/* copy KEY_MODIFIER_COMMAND|'c'
+ * cut KEY_MODIFIER_COMMAND|'x'
+ * paste KEY_MODIFIER_COMMAND|'v'
+ * select all KEY_MODIFIER_COMMAND|'a'
+ * preferences KEY_MODIFIER_COMMAND|','
+ * hide vlc KEY_MODIFIER_COMMAND|'h'
+ * hide other KEY_MODIFIER_COMMAND|KEY_MODIFIER_ALT|'h'
+ * open file KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'o'
+ * open KEY_MODIFIER_COMMAND|'o'
+ * open disk KEY_MODIFIER_COMMAND|'d'
+ * open network KEY_MODIFIER_COMMAND|'n'
+ * save playlist KEY_MODIFIER_COMMAND|'s'
+ * playlist random KEY_MODIFIER_COMMAND|'z'
+ * playlist repeat all KEY_MODIFIER_COMMAND|'l'
+ * playlist repeat KEY_MODIFIER_COMMAND|'r'
+ * video half size KEY_MODIFIER_COMMAND|'0'
+ * video normal size KEY_MODIFIER_COMMAND|'1'
+ * video double size KEY_MODIFIER_COMMAND|'2'
+ * video fit to screen KEY_MODIFIER_COMMAND|'3'
+ * minimize window KEY_MODIFIER_COMMAND|'m'
+ * close window KEY_MODIFIER_COMMAND|'w'
+ * show controller KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'c'
+ * show playlist KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'p'
+ * show info KEY_MODIFIER_COMMAND|'i'
+ * help KEY_MODIFIER_COMMAND|'?'
+ */
# define KEY_FULLSCREEN KEY_MODIFIER_COMMAND|'f'
# define KEY_PLAY_PAUSE KEY_MODIFIER_COMMAND|'p'
# define KEY_PAUSE KEY_UNSET
# 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_SUBDELAY_UP KEY_MODIFIER_COMMAND|'k'
-# define KEY_SUBDELAY_DOWN KEY_MODIFIER_COMMAND|'j'
+# define KEY_SUBDELAY_UP 'j'
+# define KEY_SUBDELAY_DOWN 'h'
+# define KEY_AUDIODELAY_UP 'g'
+# define KEY_AUDIODELAY_DOWN 'f'
# define KEY_AUDIO_TRACK 'l'
# define KEY_SUBTITLE_TRACK 's'
# define KEY_INTF_SHOW 'i'
+# define KEY_SNAPSHOT KEY_MODIFIER_COMMAND|KEY_MODIFIER_ALT|'s'
# define KEY_SET_BOOKMARK1 KEY_MODIFIER_COMMAND|KEY_F1
# define KEY_SET_BOOKMARK2 KEY_MODIFIER_COMMAND|KEY_F2
# define KEY_VOL_MUTE 'm'
# define KEY_SUBDELAY_UP KEY_MODIFIER_CTRL|'h'
# define KEY_SUBDELAY_DOWN KEY_MODIFIER_CTRL|'j'
+# define KEY_AUDIODELAY_UP KEY_MODIFIER_CTRL|'k'
+# define KEY_AUDIODELAY_DOWN KEY_MODIFIER_CTRL|'l'
+
# define KEY_AUDIO_TRACK 'l'
# define KEY_SUBTITLE_TRACK 'k'
# define KEY_INTF_SHOW 'i'
+# define KEY_SNAPSHOT KEY_MODIFIER_CTRL|'s'
# define KEY_SET_BOOKMARK1 KEY_MODIFIER_CTRL|KEY_F1
# define KEY_SET_BOOKMARK2 KEY_MODIFIER_CTRL|KEY_F2
SUBDELAY_UP_KEY_TEXT, SUBDELAY_UP_KEY_LONGTEXT, VLC_TRUE );
add_key( "key-subdelay-down", KEY_SUBDELAY_DOWN, NULL,
SUBDELAY_DOWN_KEY_TEXT, SUBDELAY_DOWN_KEY_LONGTEXT, VLC_TRUE );
+ add_key( "key-audiodelay-up", KEY_AUDIODELAY_UP, NULL,
+ AUDIODELAY_UP_KEY_TEXT, AUDIODELAY_UP_KEY_LONGTEXT, VLC_TRUE );
+ add_key( "key-audiodelay-down", KEY_AUDIODELAY_DOWN, NULL,
+ AUDIODELAY_DOWN_KEY_TEXT, AUDIODELAY_DOWN_KEY_LONGTEXT, VLC_TRUE );
add_key( "key-audio-track", KEY_AUDIO_TRACK, NULL, AUDIO_TRACK_KEY_TEXT,
AUDIO_TRACK_KEY_LONGTEXT, VLC_FALSE );
add_key( "key-subtitle-track", KEY_SUBTITLE_TRACK, NULL,
SUBTITLE_TRACK_KEY_TEXT, SUBTITLE_TRACK_KEY_LONGTEXT, VLC_FALSE );
add_key( "key-intf-show", KEY_INTF_SHOW, NULL,
INTF_SHOW_KEY_TEXT, INTF_SHOW_KEY_LONGTEXT, VLC_TRUE );
+ add_key( "key-snapshot", KEY_SNAPSHOT, NULL,
+ SNAP_KEY_TEXT, SNAP_KEY_LONGTEXT, VLC_TRUE );
add_key( "key-set-bookmark1", KEY_SET_BOOKMARK1, NULL,
SET_BOOKMARK1_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE );
N_("print help (can be combined with --advanced)") },
{ CONFIG_ITEM_BOOL, NULL, "longhelp", 'H',
N_("print detailed help (can be combined with --advanced)") },
+ { CONFIG_ITEM_BOOL, NULL, "help-verbose", '\0',
+ N_("ask for extra verbosity when displaying help") },
{ CONFIG_ITEM_BOOL, NULL, "list", 'l',
N_("print a list of available modules") },
{ CONFIG_ITEM_STRING, NULL, "module", 'p',
{ "key-vol-mute", ACTIONID_VOL_MUTE, 0 },
{ "key-subdelay-down", ACTIONID_SUBDELAY_DOWN, 0 },
{ "key-subdelay-up", ACTIONID_SUBDELAY_UP, 0 },
+ { "key-audiodelay-down", ACTIONID_AUDIODELAY_DOWN, 0 },
+ { "key-audiodelay-up", ACTIONID_AUDIODELAY_UP, 0 },
{ "key-audio-track", ACTIONID_AUDIO_TRACK, 0},
{ "key-subtitle-track", ACTIONID_SUBTITLE_TRACK, 0},
{ "key-intf-show", ACTIONID_INTF_SHOW, 0},
+ { "key-snapshot", ACTIONID_SNAPSHOT, 0},
{ "key-nav-activate", ACTIONID_NAV_ACTIVATE, 0 },
{ "key-nav-up", ACTIONID_NAV_UP, 0 },
{ "key-nav-down", ACTIONID_NAV_DOWN, 0 },
projects / vlc / blobdiff