/*****************************************************************************
* libvlc.h: main libvlc header
*****************************************************************************
- * Copyright (C) 1998-2002 VideoLAN
+ * Copyright (C) 1998-2005 VideoLAN (Centrale Réseaux) and its contributors
* $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
* Gildas Bazin <gbazin@videolan.org>
+ * Jean-Paul Saman <jpsaman #_at_# m2x.nl>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#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", "ca", "da", "de", "es",
+ "fr", "it", "ja", "ko", "nl", "pt_BR", "ro", "ru", "tr", "zh_CN", "zh_TW" };
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 English"), N_("British English"), N_("Catalan"), N_("Danish"), N_("German"), N_("Spanish"), N_("French"), N_("Italian"), N_("Japanese"), N_("Korean"), N_("Dutch"), N_("Brazilian Portuguese"), N_("Romanian"), N_("Russian"), N_("Turkish"), N_("Simplified Chinese"), N_("Chinese Traditional") };
static char *ppsz_snap_formats[] =
{ "png", "jpg" };
#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_("Default stream")
+#define OPEN_LONGTEXT N_( \
+ "This option allows you to always open a default stream on start-up." )
#define LANGUAGE_TEXT N_("Language")
#define LANGUAGE_LONGTEXT N_( "This option allows you to set the language " \
#define MONO_TEXT N_("Force mono audio")
#define MONO_LONGTEXT N_("This will force a mono audio output.")
-#define VOLUME_TEXT N_("Audio output volume")
+#define VOLUME_TEXT N_("Default audio volume")
#define VOLUME_LONGTEXT N_( \
"You can set the default audio output volume here, in a range from 0 to " \
"1024.")
#define VOLUME_SAVE_LONGTEXT N_( \
"This saves the audio output volume when you select mute.")
+#define VOLUME_STEP_TEXT N_("Audio output volume step")
+#define VOLUME_STEP_LONGTEXT N_( \
+ "The step size of the volume is adjustable using this option, " \
+ "in a range from 0 to 1024." )
+
#define AOUT_RATE_TEXT N_("Audio output frequency (Hz)")
#define AOUT_RATE_LONGTEXT N_( \
"You can force the audio output frequency here. Common values are " \
"This option allows you to use the S/PDIF audio output by default when " \
"your hardware supports it as well as the audio stream being played.")
+#define FORCE_DOLBY_TEXT N_("Force detection of Dolby Surround")
+#define FORCE_DOLBY_LONGTEXT N_( \
+ "Use this when you know your stream is (or is not) encoded with Dolby "\
+ "Surround but fails to be detected as such. And even if the stream is "\
+ "not actually encoded with Dolby Surround, turning on this option might "\
+ "enhance your experience, especially when combined with the Headphone "\
+ "Channel Mixer." )
+static int pi_force_dolby_values[] = { 0, 1, 2 };
+static char *ppsz_force_dolby_descriptions[] = { N_("Auto"), N_("On"), N_("Off") };
+
+
#define AUDIO_FILTER_TEXT N_("Audio filters")
#define AUDIO_FILTER_LONGTEXT N_( \
"This allows you to add audio post processing filters, to modify " \
"This allows you to add visualization modules " \
"(spectrum analyzer, etc.).")
-#define AUDIO_CHANNEL_MIXER N_("Channel mixer")
-#define AUDIO_CHANNEL_MIXER_LONGTEXT N_( \
- "This allows you to choose a specific audio channel mixer. For " \
- "instance, you can use the \"headphone\" mixer that gives 5.1 feeling " \
- "with a headphone.")
-
#define VOUT_CAT_LONGTEXT N_( \
"These options allow you to modify the behavior of the video output " \
"subsystem. You can for example enable video filters (deinterlacing, " \
#define VIDEO_ON_TOP_LONGTEXT N_("Always place the video window on top of " \
"other windows." )
+#define SS_TEXT N_("Disable screensaver")
+#define SS_LONGTEXT N_("Disable the screensaver during video playback." )
+
#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.")
+ "frames, etc... around the video.")
#define FILTER_TEXT N_("Video filter module")
#define FILTER_LONGTEXT N_( \
"Allows you to specify the image format in which the video snapshots will " \
"be stored.")
+#define CROP_TEXT N_("Video cropping")
+#define CROP_LONGTEXT N_( \
+ "This will force the cropping of the source video. " \
+ "Accepted formats are x:y (4:3, 16:9, etc.) expressing the global image " \
+ "aspect.")
+
#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 HDTV_FIX_TEXT N_("Fix HDTV height")
+#define HDTV_FIX_LONGTEXT N_( \
+ "This option allows proper handling of HDTV-1080 video format " \
+ "even if broken encoder incorrectly set height to 1088 lines. " \
+ "Disable this option only if your video has non-standard format " \
+ "requiring all 1088 lines.")
+
+#define MASPECT_RATIO_TEXT N_("Monitor pixel aspect ratio")
+#define MASPECT_RATIO_LONGTEXT N_( \
+ "This will force the monitor aspect ratio. Most monitors have square " \
+ "pixels (1:1). If you have a 16:9 screen, you might need to change this " \
+ "to 4:3 in order to keep proportions.")
+
#define SKIP_FRAMES_TEXT N_("Skip frames")
#define SKIP_FRAMES_LONGTEXT N_( \
- "Disable this option to disable frame drops on MPEG-2 streams.")
+ "This option enables framedropping on MPEG2 stream. Framedropping " \
+ "occurs when your computer is not powerful enough" )
+
+#define QUIET_SYNCHRO_TEXT N_("Quiet synchro")
+#define QUIET_SYNCHRO_LONGTEXT N_( \
+ "Enable this option to avoid flooding the message log with debug " \
+ "output from the video output synchro.")
#define INPUT_CAT_LONGTEXT N_( \
"These options allow you to modify the behavior of the input " \
#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 MTU_TEXT N_("MTU of the network interface")
#define MTU_LONGTEXT N_( \
- "This is the typical size of UDP packets that we expect. On Ethernet " \
- "it is usually 1500.")
-
-#define IFACE_ADDR_TEXT N_("Network interface address")
-#define IFACE_ADDR_LONGTEXT N_( \
- "If you have several interfaces on your machine and use the " \
- "multicast solution, you will probably have to indicate the IP address " \
- "of your multicasting interface here.")
+ "This is the maximum packet size that can be transmitted " \
+ "over network interface. On Ethernet it is usually 1500 bytes.")
-#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_TEXT N_("Program to select")
#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_TEXT N_("Programs to select")
#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_CHAN_TEXT N_("Choose audio channel")
-#define INPUT_CHAN_LONGTEXT N_( \
- "Give the stream number of the audio channel you want to use" \
+#define INPUT_AUDIOTRACK_TEXT N_("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 subtitles track")
-#define INPUT_CHAN_LANG_TEXT N_("Choose audio language")
-#define INPUT_CHAN_LANG_LONGTEXT N_( \
- "Give the language of the audio channel you want to use " \
- "(comma separted, two or tree letter country code).")
-#define INPUT_SUB_LANG_TEXT N_("Choose subtitle track")
-#define INPUT_SUB_LANG_LONGTEXT N_( \
- "Give the language of the subtitle channel you want to use " \
- "(comma separted, two or tree letter country code).")
+#define INPUT_SUBTRACK_TEXT N_("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_AUDIOTRACK_LANG_TEXT N_("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_SUB_LONGTEXT N_( \
- "Give the stream number of the subtitle channel you want to use " \
- "(from 0 to n).")
+#define INPUT_SUBTRACK_LANG_TEXT N_("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 " \
#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.")
+ "of inputs that will be concatenated after the normal one.")
#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.")
+#define INPUT_SLAVE_LONGTEXT N_("Allows you to play from several streams at " \
+ "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 " \
"\"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 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 " \
#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_( \
#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" )
"These options allow you to enable special CPU optimizations.\n" \
"You should always leave all these enabled." )
+#define FPU_TEXT N_("Enable FPU support")
+#define FPU_LONGTEXT N_( \
+ "If your processor has a floating point calculation unit, VLC can take " \
+ "advantage of it.")
+
#define MMX_TEXT N_("Enable CPU MMX support")
#define MMX_LONGTEXT N_( \
"If your processor supports the MMX instructions set, VLC can take " \
#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_( \
"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 " \
#define ACCESS_TEXT N_("Access module")
#define ACCESS_LONGTEXT N_( \
- "This is a legacy entry to let you configure access modules.")
+ "This allows you to force an access module. You can use it if " \
+ "the correct access is not automatically detected. You should not "\
+ "set this as a global option unless you really know what you are doing." )
+
+#define ACCESS_FILTER_TEXT N_("Access filter module")
+#define ACCESS_FILTER_LONGTEXT N_( \
+ "This is a legacy entry to let you configure access filter modules.")
#define DEMUX_TEXT N_("Demux module")
#define DEMUX_LONGTEXT N_( \
"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 " \
#define POSITION_KEY_TEXT N_("Position")
#define POSITION_KEY_LONGTEXT N_("Select the hotkey to display the position.")
+#define JB3SEC_KEY_TEXT N_("Jump 3 seconds backwards")
+#define JB3SEC_KEY_LONGTEXT N_("Select the hotkey to jump 3 seconds backwards.")
#define JB10SEC_KEY_TEXT N_("Jump 10 seconds backwards")
#define JB10SEC_KEY_LONGTEXT N_("Select the hotkey to jump 10 seconds backwards.")
#define JB1MIN_KEY_LONGTEXT N_("Select the hotkey to jump 1 minute backwards.")
#define JB5MIN_KEY_TEXT N_("Jump 5 minutes backwards")
#define JB5MIN_KEY_LONGTEXT N_("Select the hotkey to jump 5 minutes backwards.")
+
+#define JF3SEC_KEY_TEXT N_("Jump 3 seconds forward")
+#define JF3SEC_KEY_LONGTEXT N_("Select the hotkey to jump 3 seconds forward.")
#define JF10SEC_KEY_TEXT N_("Jump 10 seconds forward")
#define JF10SEC_KEY_LONGTEXT N_("Select the hotkey to jump 10 seconds forward.")
#define JF1MIN_KEY_TEXT N_("Jump 1 minute forward")
#define JF1MIN_KEY_LONGTEXT N_("Select the hotkey to jump 1 minute forward.")
-
#define JF5MIN_KEY_TEXT N_("Jump 5 minutes forward")
#define JF5MIN_KEY_LONGTEXT N_("Select the hotkey to jump 5 minutes forward.")
#define NAV_RIGHT_KEY_LONGTEXT N_("Select the key to move the selector right in DVD menus.")
#define NAV_ACTIVATE_KEY_TEXT N_("Activate")
#define NAV_ACTIVATE_KEY_LONGTEXT N_("Select the key to activate selected item in DVD menus.")
+#define DISC_MENU_TEXT N_("Go to the DVD menu")
+#define DISC_MENU_LONGTEXT N_("Select the key to take you to the DVD menu")
+#define TITLE_PREV_TEXT N_("Select previous DVD title")
+#define TITLE_PREV_LONGTEXT N_("Select the key to choose the previous title from the DVD")
+#define TITLE_NEXT_TEXT N_("Select next DVD title")
+#define TITLE_NEXT_LONGTEXT N_("Select the key to choose the next title from the DVD")
+#define CHAPTER_PREV_TEXT N_("Select prev DVD chapter")
+#define CHAPTER_PREV_LONGTEXT N_("Select the key to choose the previous chapter from the DVD")
+#define CHAPTER_NEXT_TEXT N_("Select prev DVD chapter")
+#define CHAPTER_NEXT_LONGTEXT N_("Select the key to choose the next chapter from the DVD")
#define VOL_UP_KEY_TEXT N_("Volume up")
#define VOL_UP_KEY_LONGTEXT N_("Select the key to increase audio volume.")
#define VOL_DOWN_KEY_TEXT N_("Volume down")
#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 INTF_HIDE_KEY_TEXT N_("Hide interface")
+#define INTF_HIDE_KEY_LONGTEXT N_("Lower the interface below 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 URL[@[title][:chapter][-[title][:chapter]]] [:option=value]" \
+#define RECORD_KEY_TEXT N_("Record")
+#define RECORD_KEY_LONGTEXT N_("Record access filter start/stop.")
+
+
+#define VLC_USAGE N_( \
+ "Usage: %s [options] [playlistitems] ..." \
+ "\nYou can specify multiple playlistitems on the commandline. They will be enqueued in the playlist." \
+ "\nThe first item specified will be played first." \
+ "\n" \
+ "\nOptions-styles:" \
+ "\n --option A global option that is set for the duration of the program." \
+ "\n -option A single letter version of a global --option." \
+ "\n :option An option that only applies to the playlistitem directly before it" \
+ "\n and that overrides previous settings." \
+ "\n" \
+ "\nPlaylistitem MRL syntax:" \
+ "\n [[access][/demux]://]URL[@[title][:chapter][-[title][:chapter]]] [:option=value ...]" \
+ "\n" \
+ "\n Many of the global --options can also be used as MRL specific :options." \
+ "\n Multiple :option=value pairs can be specified." \
+ "\n" \
"\nURL syntax:" \
- "\n [file://]filename plain media file" \
+ "\n [file://]filename Plain media file" \
"\n http://ip:port/file HTTP URL" \
"\n ftp://ip:port/file FTP URL" \
"\n mms://ip:port/file MMS URL" \
"\n [cdda://][device] Audio CD device" \
"\n udp:[[<source address>]@[<bind address>][:<bind port>]]" \
"\n UDP stream sent by a streaming server"\
- "\n vlc:pause pause execution of playlist items" \
- "\n vlc:quit quit VLC" \
+ "\n vlc:pause:<seconds> Special item to pause the playlist for a certain time" \
+ "\n vlc:quit Special item to quit VLC" \
"\n")
*/
vlc_module_begin();
- /* Audio options */
+/* Audio options */
set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_GENERAL );
+ add_category_hint( N_("Audio"), AOUT_CAT_LONGTEXT , VLC_FALSE );
+
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_with_range( "volume-step", AOUT_VOLUME_STEP, AOUT_VOLUME_MIN,
+ AOUT_VOLUME_MAX, NULL, VOLUME_STEP_TEXT,
+ VOLUME_STEP_LONGTEXT, VLC_TRUE );
add_integer( "aout-rate", -1, NULL, AOUT_RATE_TEXT,
AOUT_RATE_LONGTEXT, VLC_TRUE );
#if !defined( SYS_DARWIN )
AOUT_RESAMP_LONGTEXT, VLC_TRUE );
#endif
add_bool( "spdif", 0, NULL, SPDIF_TEXT, SPDIF_LONGTEXT, VLC_FALSE );
+ add_integer( "force-dolby-surround", 0, NULL, FORCE_DOLBY_TEXT,
+ FORCE_DOLBY_LONGTEXT, VLC_FALSE );
+ change_integer_list( pi_force_dolby_values, ppsz_force_dolby_descriptions, 0 );
add_integer( "audio-desync", 0, NULL, DESYNC_TEXT,
DESYNC_LONGTEXT, VLC_TRUE );
set_subcategory( SUBCAT_AUDIO_AOUT );
NULL, AUDIO_FILTER_TEXT,
AUDIO_FILTER_LONGTEXT, VLC_FALSE );
set_subcategory( SUBCAT_AUDIO_VISUAL );
- add_string( "audio-visual", 0, NULL,AUDIO_VISUAL_TEXT,
+ add_module( "audio-visual", "visualization",NULL, NULL,AUDIO_VISUAL_TEXT,
AUDIO_VISUAL_LONGTEXT, VLC_FALSE );
- set_subcategory( SUBCAT_AUDIO_MISC );
- add_module( "audio-channel-mixer", "audio filter", NULL, NULL,
- AUDIO_CHANNEL_MIXER, AUDIO_CHANNEL_MIXER_LONGTEXT, VLC_FALSE );
- change_short('A');
- /* Video options */
+/* Video options */
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_GENERAL );
+ add_category_hint( N_("Video"), VOUT_CAT_LONGTEXT , VLC_FALSE );
+
add_bool( "video", 1, NULL, VIDEO_TEXT, VIDEO_LONGTEXT, VLC_TRUE );
- 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_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 );
+ 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_FALSE );
+ SKIP_FRAMES_LONGTEXT, VLC_TRUE );
+ add_bool( "quiet-synchro", 0, NULL, QUIET_SYNCHRO_TEXT,
+ QUIET_SYNCHRO_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 );
- add_string( "aspect-ratio", "", NULL,
- ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, VLC_TRUE );
+ add_bool( "disable-screensaver", VLC_TRUE, NULL, SS_TEXT, SS_LONGTEXT,
+ VLC_TRUE );
+
+ 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_FALSE );
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( "crop", NULL, NULL, CROP_TEXT, CROP_LONGTEXT, VLC_FALSE );
+ add_string( "aspect-ratio", NULL, NULL,
+ ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, VLC_FALSE );
+ add_string( "monitor-par", NULL, NULL,
+ MASPECT_RATIO_TEXT, MASPECT_RATIO_LONGTEXT, VLC_TRUE );
+ add_bool( "hdtv-fix", 1, NULL, HDTV_FIX_TEXT, HDTV_FIX_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 );
+
+
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,
+ 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
- /* Subpictures options */
+/* Subpictures options */
set_subcategory( SUBCAT_VIDEO_SUBPIC );
set_section( N_("On Screen Display") , NULL );
+ add_category_hint( N_("Subpictures"), SUB_CAT_LONGTEXT , VLC_FALSE );
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_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( "sub-filter", "sub filter", NULL, NULL,
- SUB_FILTER_TEXT, SUB_FILTER_LONGTEXT, VLC_TRUE );
-
- set_subcategory( SUBCAT_VIDEO_TEXT );
+ add_module_list_cat( "sub-filter", SUBCAT_VIDEO_SUBPIC, NULL, NULL,
+ SUB_FILTER_TEXT, SUB_FILTER_LONGTEXT, VLC_FALSE );
- /* Input options */
+/* Input options */
set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_ACCESS );
- set_subcategory( SUBCAT_INPUT_DEMUX );
- set_subcategory( SUBCAT_INPUT_VCODEC );
- set_subcategory( SUBCAT_INPUT_ACODEC );
- set_subcategory( SUBCAT_INPUT_SCODEC );
- set_subcategory( SUBCAT_INPUT_ADVANCED );
+ set_subcategory( SUBCAT_INPUT_GENERAL );
- set_section( N_( "Tracks settings" ), NULL );
+ 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-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 );
+ INPUT_PROGRAMS_TEXT, INPUT_PROGRAMS_LONGTEXT, VLC_TRUE );
+ add_integer( "audio-track", -1, NULL,
+ INPUT_AUDIOTRACK_TEXT, INPUT_AUDIOTRACK_LONGTEXT, VLC_TRUE );
+ add_deprecated( "audio-channel", VLC_FALSE ); /*deprecated since 0.8.2 */
+ add_integer( "sub-track", -1, NULL,
+ INPUT_SUBTRACK_TEXT, INPUT_SUBTRACK_LONGTEXT, VLC_TRUE );
+ add_deprecated("spu-channel",VLC_FALSE); /*deprecated since 0.8.2*/
add_string( "audio-language", "", NULL,
- INPUT_CHAN_LANG_TEXT, INPUT_CHAN_LANG_LONGTEXT, VLC_FALSE );
- add_string( "spu-language", "", NULL,
- INPUT_SUB_LANG_TEXT, INPUT_SUB_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 );
set_section( N_( "Playback control" ) , NULL);
add_integer( "input-repeat", 0, NULL,
- INPUT_REPEAT_TEXT, INPUT_REPEAT_LONGTEXT, VLC_TRUE );
+ INPUT_REPEAT_TEXT, INPUT_REPEAT_LONGTEXT, VLC_FALSE );
add_integer( "start-time", 0, NULL,
START_TIME_TEXT, START_TIME_LONGTEXT, VLC_TRUE );
add_integer( "stop-time", 0, NULL,
set_section( N_( "Default devices") , NULL )
- add_file( "dvd", DVD_DEVICE, NULL, DVD_DEV_TEXT, DVD_DEV_LONGTEXT,
+ add_file( "dvd", NULL, NULL, DVD_DEV_TEXT, DVD_DEV_LONGTEXT,
VLC_FALSE );
add_file( "vcd", VCD_DEVICE, NULL, VCD_DEV_TEXT, VCD_DEV_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 );
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');
+ add_integer( "ipv4-timeout", 5 * 1000, NULL, TIMEOUT_TEXT,
+ TIMEOUT_LONGTEXT, VLC_TRUE );
set_section( N_( "Socks proxy") , NULL )
add_string( "socks", NULL, NULL,
set_section( N_( "Advanced" ), NULL );
add_integer( "cr-average", 40, NULL, CR_AVERAGE_TEXT,
- CR_AVERAGE_LONGTEXT, VLC_FALSE );
+ CR_AVERAGE_LONGTEXT, VLC_TRUE );
add_integer( "clock-synchro", -1, NULL, CLOCK_SYNCHRO_TEXT,
- CLOCK_SYNCHRO_LONGTEXT, VLC_FALSE );
+ CLOCK_SYNCHRO_LONGTEXT, VLC_TRUE );
change_integer_list( pi_clock_values, ppsz_clock_descriptions, 0 );
- /* Decoder options */
+/* 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 );
+ set_subcategory( SUBCAT_INPUT_ACCESS );
+ add_category_hint( N_("Input"), INPUT_CAT_LONGTEXT , VLC_FALSE );
+ add_module( "access", "access2", NULL, NULL, ACCESS_TEXT,
+ ACCESS_LONGTEXT, VLC_TRUE );
+
+ set_subcategory( SUBCAT_INPUT_ACCESS_FILTER );
+ add_module_list_cat( "access-filter", SUBCAT_INPUT_ACCESS_FILTER, NULL, NULL,
+ ACCESS_FILTER_TEXT, ACCESS_FILTER_LONGTEXT, VLC_FALSE );
+
+
+ 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 );
+
- /* Stream output options */
+/* Stream output options */
set_category( CAT_SOUT );
set_subcategory( SUBCAT_SOUT_GENERAL );
add_category_hint( N_("Stream output"), SOUT_CAT_LONGTEXT , VLC_TRUE );
add_module( "access_output", "sout access", NULL, NULL,
ACCESS_OUTPUT_TEXT, ACCESS_OUTPUT_LONGTEXT, VLC_TRUE );
set_subcategory( SUBCAT_SOUT_PACKETIZER );
- add_module( "packetizer", "packetizer", NULL, NULL,
+ add_module( "packetizer","packetizer", NULL, NULL,
PACKETIZER_TEXT, PACKETIZER_LONGTEXT, VLC_TRUE );
set_subcategory( SUBCAT_SOUT_SAP );
ANN_SAPINTV_LONGTEXT, VLC_TRUE );
set_subcategory( SUBCAT_SOUT_VOD );
- /* CPU options */
+/* CPU options */
set_category( CAT_ADVANCED );
set_subcategory( SUBCAT_ADVANCED_CPU );
-#if defined( __i386__ )
+ add_category_hint( N_("CPU"), CPU_CAT_LONGTEXT, VLC_TRUE );
+ add_bool( "fpu", 1, NULL, FPU_TEXT, FPU_LONGTEXT, VLC_TRUE );
+#if defined( __i386__ ) || defined( __x86_64__ )
add_bool( "mmx", 1, NULL, MMX_TEXT, MMX_LONGTEXT, VLC_TRUE );
add_bool( "3dn", 1, NULL, THREE_DN_TEXT, THREE_DN_LONGTEXT, VLC_TRUE );
add_bool( "mmxext", 1, NULL, MMXEXT_TEXT, MMXEXT_LONGTEXT, VLC_TRUE );
#if defined( __powerpc__ ) || defined( SYS_DARWIN )
add_bool( "altivec", 1, NULL, ALTIVEC_TEXT, ALTIVEC_LONGTEXT, VLC_TRUE );
#endif
- /* Misc options */
+
+/* Misc options */
set_subcategory( SUBCAT_ADVANCED_MISC );
+ set_section( N_("Special modules"), NULL );
+ add_category_hint( N_("Miscellaneous"), MISC_CAT_LONGTEXT, VLC_TRUE );
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 );
+ 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 );
- 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
+ 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,
+ add_bool( "rt-priority", VLC_FALSE, NULL, RT_PRIORITY_TEXT,
RT_PRIORITY_LONGTEXT, VLC_TRUE );
#endif
#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,
WIN9X_CV_LONGTEXT, VLC_TRUE );
#endif
- /* Playlist options */
+ 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 );
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 );
+ 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_TRUE );
+ add_bool( "play-and-stop", 0, NULL, PAS_TEXT, PAS_LONGTEXT, VLC_FALSE );
+
+ add_string( "open", "", NULL, OPEN_TEXT, OPEN_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 */
+/* Interface options */
set_category( CAT_INTERFACE );
set_subcategory( SUBCAT_INTERFACE_GENERAL );
-
+ add_category_hint( N_("Interface"), INTF_CAT_LONGTEXT , VLC_FALSE );
set_section ( N_("Interface module" ), NULL );
add_module_cat( "intf", SUBCAT_INTERFACE_GENERAL, NULL, NULL, INTF_TEXT,
INTF_LONGTEXT, VLC_FALSE );
add_module_list_cat( "control", SUBCAT_INTERFACE_CONTROL, NULL, NULL,
CONTROL_TEXT, CONTROL_LONGTEXT, VLC_FALSE );
- /* Hotkey options*/
+/* Hotkey options*/
set_subcategory( SUBCAT_INTERFACE_HOTKEYS );
add_category_hint( N_("Hot keys"), HOTKEY_CAT_LONGTEXT , VLC_FALSE );
# define KEY_PREV KEY_MODIFIER_COMMAND|KEY_LEFT
# define KEY_STOP KEY_MODIFIER_COMMAND|'.'
# define KEY_POSITION 't'
+# define KEY_JUMP_M3SEC KEY_MODIFIER_COMMAND|KEY_MODIFIER_CTRL|KEY_LEFT
+# define KEY_JUMP_P3SEC KEY_MODIFIER_COMMAND|KEY_MODIFIER_CTRL|KEY_RIGHT
# define KEY_JUMP_M10SEC KEY_MODIFIER_COMMAND|KEY_MODIFIER_ALT|KEY_LEFT
# define KEY_JUMP_P10SEC KEY_MODIFIER_COMMAND|KEY_MODIFIER_ALT|KEY_RIGHT
# define KEY_JUMP_M1MIN KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|KEY_LEFT
# 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'
# define KEY_AUDIO_TRACK 'l'
# define KEY_SUBTITLE_TRACK 's'
# define KEY_INTF_SHOW 'i'
+# define KEY_INTF_HIDE 'I'
+# define KEY_DISC_MENU KEY_MODIFIER_CTRL|'m'
+# define KEY_TITLE_PREV KEY_MODIFIER_CTRL|'p'
+# define KEY_TITLE_NEXT KEY_MODIFIER_CTRL|'n'
+# define KEY_CHAPTER_PREV KEY_MODIFIER_CTRL|'u'
+# define KEY_CHAPTER_NEXT KEY_MODIFIER_CTRL|'d'
# define KEY_SNAPSHOT KEY_MODIFIER_COMMAND|KEY_MODIFIER_ALT|'s'
# define KEY_SET_BOOKMARK1 KEY_MODIFIER_COMMAND|KEY_F1
# define KEY_PLAY_BOOKMARK10 KEY_UNSET
# define KEY_HISTORY_BACK KEY_MODIFIER_COMMAND|'['
# define KEY_HISTORY_FORWARD KEY_MODIFIER_COMMAND|']'
+# define KEY_RECORD KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'r'
#else
# define KEY_FULLSCREEN 'f'
# define KEY_PREV 'p'
# define KEY_STOP 's'
# define KEY_POSITION 't'
+# define KEY_JUMP_M3SEC KEY_MODIFIER_SHIFT|KEY_LEFT
+# define KEY_JUMP_P3SEC KEY_MODIFIER_SHIFT|KEY_RIGHT
# define KEY_JUMP_M10SEC KEY_MODIFIER_ALT|KEY_LEFT
# define KEY_JUMP_P10SEC KEY_MODIFIER_ALT|KEY_RIGHT
# define KEY_JUMP_M1MIN KEY_MODIFIER_CTRL|KEY_LEFT
# define KEY_AUDIO_TRACK 'l'
# define KEY_SUBTITLE_TRACK 'k'
# define KEY_INTF_SHOW 'i'
-# define KEY_SNAPSHOT KEY_MODIFIER_CTRL|'s'
+# define KEY_INTF_HIDE 'I'
+# define KEY_DISC_MENU KEY_MODIFIER_CTRL|'m'
+# define KEY_TITLE_PREV KEY_MODIFIER_CTRL|'p'
+# define KEY_TITLE_NEXT KEY_MODIFIER_CTRL|'n'
+# define KEY_CHAPTER_PREV KEY_MODIFIER_CTRL|'u'
+# define KEY_CHAPTER_NEXT KEY_MODIFIER_CTRL|'d'
+# define KEY_SNAPSHOT KEY_MODIFIER_CTRL|KEY_MODIFIER_ALT|'s'
# define KEY_SET_BOOKMARK1 KEY_MODIFIER_CTRL|KEY_F1
# define KEY_SET_BOOKMARK2 KEY_MODIFIER_CTRL|KEY_F2
# define KEY_PLAY_BOOKMARK8 KEY_F8
# define KEY_PLAY_BOOKMARK9 KEY_F9
# define KEY_PLAY_BOOKMARK10 KEY_F10
-# define KEY_HISTORY_BACK KEY_MODIFIER_CTRL|'['
-# define KEY_HISTORY_FORWARD KEY_MODIFIER_CTRL|']'
+# define KEY_HISTORY_BACK KEY_MODIFIER_CTRL|'v'
+# define KEY_HISTORY_FORWARD KEY_MODIFIER_CTRL|'b'
+# define KEY_RECORD KEY_MODIFIER_CTRL|'r'
#endif
add_key( "key-fullscreen", KEY_FULLSCREEN, NULL, FULLSCREEN_KEY_TEXT,
STOP_KEY_LONGTEXT, VLC_FALSE );
add_key( "key-position", KEY_POSITION, NULL, POSITION_KEY_TEXT,
POSITION_KEY_LONGTEXT, VLC_TRUE );
+ add_key( "key-jump-3sec", KEY_JUMP_M3SEC, NULL, JB3SEC_KEY_TEXT,
+ JB3SEC_KEY_LONGTEXT, VLC_FALSE );
+ add_key( "key-jump+3sec", KEY_JUMP_P3SEC, NULL, JF3SEC_KEY_TEXT,
+ JF3SEC_KEY_LONGTEXT, VLC_FALSE );
add_key( "key-jump-10sec", KEY_JUMP_M10SEC, NULL, JB10SEC_KEY_TEXT,
JB10SEC_KEY_LONGTEXT, VLC_FALSE );
add_key( "key-jump+10sec", KEY_JUMP_P10SEC, NULL, JF10SEC_KEY_TEXT,
add_key( "key-nav-right", KEY_NAV_RIGHT, NULL, NAV_RIGHT_KEY_TEXT,
NAV_RIGHT_KEY_LONGTEXT, VLC_TRUE );
+ add_key( "key-disc-menu", KEY_DISC_MENU, NULL, DISC_MENU_TEXT,
+ DISC_MENU_LONGTEXT, VLC_TRUE );
+ add_key( "key-title-prev", KEY_TITLE_PREV, NULL, TITLE_PREV_TEXT,
+ TITLE_PREV_LONGTEXT, VLC_TRUE );
+ add_key( "key-title-next", KEY_TITLE_NEXT, NULL, TITLE_NEXT_TEXT,
+ TITLE_NEXT_LONGTEXT, VLC_TRUE );
+ add_key( "key-chapter-prev", KEY_CHAPTER_PREV, NULL, CHAPTER_PREV_TEXT,
+ CHAPTER_PREV_LONGTEXT, VLC_TRUE );
+ add_key( "key-chapter-next", KEY_CHAPTER_NEXT, NULL, CHAPTER_NEXT_TEXT,
+ CHAPTER_NEXT_LONGTEXT, VLC_TRUE );
+
add_key( "key-quit", KEY_QUIT, NULL, QUIT_KEY_TEXT,
QUIT_KEY_LONGTEXT, VLC_FALSE );
add_key( "key-vol-up", KEY_VOL_UP, NULL, VOL_UP_KEY_TEXT,
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-intf-hide", KEY_INTF_HIDE, NULL,
+ INTF_HIDE_KEY_TEXT, INTF_HIDE_KEY_LONGTEXT, VLC_TRUE );
add_key( "key-snapshot", KEY_SNAPSHOT, NULL,
SNAP_KEY_TEXT, SNAP_KEY_LONGTEXT, VLC_TRUE );
HISTORY_BACK_LONGTEXT, VLC_TRUE );
add_key( "key-history-forward", KEY_HISTORY_FORWARD, NULL,
HISTORY_FORWARD_TEXT, HISTORY_FORWARD_LONGTEXT, VLC_TRUE );
+ add_key( "key-record", KEY_RECORD, NULL,
+ RECORD_KEY_TEXT, RECORD_KEY_LONGTEXT, VLC_TRUE );
/* Usage (mainly useful for cmd line stuff) */
- add_usage_hint( PLAYLIST_USAGE );
+ /* add_usage_hint( PLAYLIST_USAGE ); */
set_description( N_("main program") );
set_capability( "main", 100 );
static module_config_t p_help_config[] =
{
{ CONFIG_ITEM_BOOL, NULL, "help", 'h',
- N_("print help (can be combined with --advanced)") },
+ N_("print help for VLC (can be combined with --advanced)") },
{ CONFIG_ITEM_BOOL, NULL, "longhelp", 'H',
- N_("print detailed help (can be combined with --advanced)") },
+ N_("print help for VLC and all it's modules (can be combined with --advanced)") },
+ { CONFIG_ITEM_BOOL, NULL, "advanced", '\0',
+ N_("print help for the advanced options") },
{ 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',
- N_("print help on module (can be combined with --advanced)") },
+ N_("print help on a specific module (can be combined with --advanced)") },
{ CONFIG_ITEM_BOOL, NULL, "save-config", '\0',
N_("save the current command line options in the config") },
{ CONFIG_ITEM_BOOL, NULL, "reset-config", '\0',
*****************************************************************************/
static struct hotkey p_hotkeys[] =
{
- { "key-quit", ACTIONID_QUIT, 0 },
- { "key-play-pause", ACTIONID_PLAY_PAUSE, 0 },
- { "key-play", ACTIONID_PLAY, 0 },
- { "key-pause", ACTIONID_PAUSE, 0 },
- { "key-stop", ACTIONID_STOP, 0 },
- { "key-position", ACTIONID_POSITION, 0 },
- { "key-jump-10sec", ACTIONID_JUMP_BACKWARD_10SEC, 0 },
- { "key-jump+10sec", ACTIONID_JUMP_FORWARD_10SEC, 0 },
- { "key-jump-1min", ACTIONID_JUMP_BACKWARD_1MIN, 0 },
- { "key-jump+1min", ACTIONID_JUMP_FORWARD_1MIN, 0 },
- { "key-jump-5min", ACTIONID_JUMP_BACKWARD_5MIN, 0 },
- { "key-jump+5min", ACTIONID_JUMP_FORWARD_5MIN, 0 },
- { "key-prev", ACTIONID_PREV, 0 },
- { "key-next", ACTIONID_NEXT, 0 },
- { "key-faster", ACTIONID_FASTER, 0 },
- { "key-slower", ACTIONID_SLOWER, 0 },
- { "key-fullscreen", ACTIONID_FULLSCREEN, 0 },
- { "key-vol-up", ACTIONID_VOL_UP, 0 },
- { "key-vol-down", ACTIONID_VOL_DOWN, 0 },
- { "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 },
- { "key-nav-left", ACTIONID_NAV_LEFT, 0 },
- { "key-nav-right", ACTIONID_NAV_RIGHT, 0 },
- { "key-set-bookmark1", ACTIONID_SET_BOOKMARK1, 0},
- { "key-set-bookmark2", ACTIONID_SET_BOOKMARK2, 0},
- { "key-set-bookmark3", ACTIONID_SET_BOOKMARK3, 0},
- { "key-set-bookmark4", ACTIONID_SET_BOOKMARK4, 0},
- { "key-set-bookmark5", ACTIONID_SET_BOOKMARK5, 0},
- { "key-set-bookmark6", ACTIONID_SET_BOOKMARK6, 0},
- { "key-set-bookmark7", ACTIONID_SET_BOOKMARK7, 0},
- { "key-set-bookmark8", ACTIONID_SET_BOOKMARK8, 0},
- { "key-set-bookmark9", ACTIONID_SET_BOOKMARK9, 0},
- { "key-set-bookmark10", ACTIONID_SET_BOOKMARK10, 0},
- { "key-play-bookmark1", ACTIONID_PLAY_BOOKMARK1, 0},
- { "key-play-bookmark2", ACTIONID_PLAY_BOOKMARK2, 0},
- { "key-play-bookmark3", ACTIONID_PLAY_BOOKMARK3, 0},
- { "key-play-bookmark4", ACTIONID_PLAY_BOOKMARK4, 0},
- { "key-play-bookmark5", ACTIONID_PLAY_BOOKMARK5, 0},
- { "key-play-bookmark6", ACTIONID_PLAY_BOOKMARK6, 0},
- { "key-play-bookmark7", ACTIONID_PLAY_BOOKMARK7, 0},
- { "key-play-bookmark8", ACTIONID_PLAY_BOOKMARK8, 0},
- { "key-play-bookmark9", ACTIONID_PLAY_BOOKMARK9, 0},
- { "key-play-bookmark10", ACTIONID_PLAY_BOOKMARK10, 0},
- { "key-history-back", ACTIONID_HISTORY_BACK, 0},
- { "key-history-forward", ACTIONID_HISTORY_FORWARD, 0},
- { NULL, 0, 0 }
+ { "key-quit", ACTIONID_QUIT, 0, 0, 0, 0 },
+ { "key-play-pause", ACTIONID_PLAY_PAUSE, 0, 0, 0, 0 },
+ { "key-play", ACTIONID_PLAY, 0, 0, 0, 0 },
+ { "key-pause", ACTIONID_PAUSE, 0, 0, 0, 0 },
+ { "key-stop", ACTIONID_STOP, 0, 0, 0, 0 },
+ { "key-position", ACTIONID_POSITION, 0, 0, 0, 0 },
+ { "key-jump-3sec", ACTIONID_JUMP_BACKWARD_3SEC, 0, 1000000, 0, 0 },
+ { "key-jump+3sec", ACTIONID_JUMP_FORWARD_3SEC, 0, 1000000, 0, 0 },
+ { "key-jump-10sec", ACTIONID_JUMP_BACKWARD_10SEC, 0, 1000000, 0, 0 },
+ { "key-jump+10sec", ACTIONID_JUMP_FORWARD_10SEC, 0, 1000000, 0, 0 },
+ { "key-jump-1min", ACTIONID_JUMP_BACKWARD_1MIN, 0, 1000000, 0, 0 },
+ { "key-jump+1min", ACTIONID_JUMP_FORWARD_1MIN, 0, 1000000, 0, 0 },
+ { "key-jump-5min", ACTIONID_JUMP_BACKWARD_5MIN, 0, 1000000, 0, 0 },
+ { "key-jump+5min", ACTIONID_JUMP_FORWARD_5MIN, 0, 1000000, 0, 0 },
+ { "key-prev", ACTIONID_PREV, 0, 0, 0, 0 },
+ { "key-next", ACTIONID_NEXT, 0, 0, 0, 0 },
+ { "key-faster", ACTIONID_FASTER, 0, 0, 0, 0 },
+ { "key-slower", ACTIONID_SLOWER, 0, 0, 0, 0 },
+ { "key-fullscreen", ACTIONID_FULLSCREEN, 0, 0, 0, 0 },
+ { "key-vol-up", ACTIONID_VOL_UP, 0, 0, 0, 0 },
+ { "key-vol-down", ACTIONID_VOL_DOWN, 0, 0, 0, 0 },
+ { "key-vol-mute", ACTIONID_VOL_MUTE, 0, 0, 0, 0 },
+ { "key-subdelay-down", ACTIONID_SUBDELAY_DOWN, 0, 0, 0, 0 },
+ { "key-subdelay-up", ACTIONID_SUBDELAY_UP, 0, 0, 0, 0 },
+ { "key-audiodelay-down", ACTIONID_AUDIODELAY_DOWN, 0, 0, 0, 0 },
+ { "key-audiodelay-up", ACTIONID_AUDIODELAY_UP, 0, 0, 0, 0 },
+ { "key-audio-track", ACTIONID_AUDIO_TRACK, 0, 0, 0, 0 },
+ { "key-subtitle-track", ACTIONID_SUBTITLE_TRACK, 0, 0, 0, 0 },
+ { "key-intf-show", ACTIONID_INTF_SHOW, 0, 0, 0, 0 },
+ { "key-intf-hide", ACTIONID_INTF_HIDE, 0, 0, 0, 0 },
+ { "key-snapshot", ACTIONID_SNAPSHOT, 0, 0, 0, 0 },
+ { "key-nav-activate", ACTIONID_NAV_ACTIVATE, 0, 0, 0, 0 },
+ { "key-nav-up", ACTIONID_NAV_UP, 0, 0, 0, 0 },
+ { "key-nav-down", ACTIONID_NAV_DOWN, 0, 0, 0, 0 },
+ { "key-nav-left", ACTIONID_NAV_LEFT, 0, 0, 0, 0 },
+ { "key-nav-right", ACTIONID_NAV_RIGHT, 0, 0, 0, 0 },
+ { "key-disc-menu", ACTIONID_DISC_MENU, 0, 0, 0, 0 },
+ { "key-title-prev", ACTIONID_TITLE_PREV, 0, 0, 0, 0 },
+ { "key-title-next", ACTIONID_TITLE_NEXT, 0, 0, 0, 0 },
+ { "key-chapter-prev", ACTIONID_CHAPTER_PREV, 0, 0, 0, 0 },
+ { "key-chapter-next", ACTIONID_CHAPTER_NEXT, 0, 0, 0, 0 },
+ { "key-set-bookmark1", ACTIONID_SET_BOOKMARK1, 0, 0, 0, 0 },
+ { "key-set-bookmark2", ACTIONID_SET_BOOKMARK2, 0, 0, 0, 0 },
+ { "key-set-bookmark3", ACTIONID_SET_BOOKMARK3, 0, 0, 0, 0 },
+ { "key-set-bookmark4", ACTIONID_SET_BOOKMARK4, 0, 0, 0, 0 },
+ { "key-set-bookmark5", ACTIONID_SET_BOOKMARK5, 0, 0, 0, 0 },
+ { "key-set-bookmark6", ACTIONID_SET_BOOKMARK6, 0, 0, 0, 0 },
+ { "key-set-bookmark7", ACTIONID_SET_BOOKMARK7, 0, 0, 0, 0 },
+ { "key-set-bookmark8", ACTIONID_SET_BOOKMARK8, 0, 0, 0, 0 },
+ { "key-set-bookmark9", ACTIONID_SET_BOOKMARK9, 0, 0, 0, 0 },
+ { "key-set-bookmark10", ACTIONID_SET_BOOKMARK10, 0, 0, 0, 0 },
+ { "key-play-bookmark1", ACTIONID_PLAY_BOOKMARK1, 0, 0, 0, 0 },
+ { "key-play-bookmark2", ACTIONID_PLAY_BOOKMARK2, 0, 0, 0, 0 },
+ { "key-play-bookmark3", ACTIONID_PLAY_BOOKMARK3, 0, 0, 0, 0 },
+ { "key-play-bookmark4", ACTIONID_PLAY_BOOKMARK4, 0, 0, 0, 0 },
+ { "key-play-bookmark5", ACTIONID_PLAY_BOOKMARK5, 0, 0, 0, 0 },
+ { "key-play-bookmark6", ACTIONID_PLAY_BOOKMARK6, 0, 0, 0, 0 },
+ { "key-play-bookmark7", ACTIONID_PLAY_BOOKMARK7, 0, 0, 0, 0 },
+ { "key-play-bookmark8", ACTIONID_PLAY_BOOKMARK8, 0, 0, 0, 0 },
+ { "key-play-bookmark9", ACTIONID_PLAY_BOOKMARK9, 0, 0, 0, 0 },
+ { "key-play-bookmark10", ACTIONID_PLAY_BOOKMARK10, 0, 0, 0, 0 },
+ { "key-history-back", ACTIONID_HISTORY_BACK, 0, 0, 0, 0 },
+ { "key-history-forward", ACTIONID_HISTORY_FORWARD, 0, 0, 0, 0 },
+ { "key-record", ACTIONID_RECORD, 0, 0, 0, 0 },
+ { NULL, 0, 0, 0, 0, 0 }
};
-
projects / vlc / blobdiff