N_("Norwegian"), N_("Polish"), N_("Brazilian"), N_("Russian"),
N_("Swedish") };
+static char *ppsz_snap_formats[] =
+{ "png", "jpg" };
+
/*****************************************************************************
* Configuration options for the main program. Each module will also separatly
* define its own configuration options.
"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 " \
"When using the PVR input (or a very irregular source), you should " \
"set this to 10000.")
-#define SERVER_PORT_TEXT N_("Server port")
+#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_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 " \
+ "Give the stream number of the audio channel you want to use" \
"(from 0 to n).")
-#define INPUT_SUB_TEXT N_("Choose subtitle track")
+#define INPUT_SUB_TEXT N_("Choose subtitles track")
#define INPUT_SUB_LONGTEXT N_( \
"Give the stream number of the subtitle channel you want to use " \
"(from 0 to n).")
#define INPUT_REPEAT_TEXT N_("Input repetitions")
-#define INPUT_REPEAT_LONGTEXT 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 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 " \
#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:" \
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", 0, NULL, VIDEO_DECO_TEXT,
+ 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 );
#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_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_subcategory( SUBCAT_VIDEO_VOUT );
add_module( "vout", "video output", NULL, NULL, VOUT_TEXT, VOUT_LONGTEXT,
set_subcategory( SUBCAT_VIDEO_VFILTER );
add_module_list_cat( "filter", SUBCAT_VIDEO_VFILTER, NULL, NULL,
FILTER_TEXT, FILTER_LONGTEXT, VLC_FALSE );
+
#if 0
add_string( "pixel-ratio", "1", NULL, PIXEL_RATIO_TEXT, PIXEL_RATIO_TEXT );
#endif
set_subcategory( SUBCAT_INPUT_ACODEC );
set_subcategory( SUBCAT_INPUT_SCODEC );
set_subcategory( SUBCAT_INPUT_ADVANCED );
- 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_section( N_( "Tracks settings" ), NULL );
add_integer( "program", 0, NULL,
INPUT_PROGRAM_TEXT, INPUT_PROGRAM_LONGTEXT, VLC_TRUE );
add_string( "programs", "", NULL,
INPUT_CHAN_TEXT, INPUT_CHAN_LONGTEXT, VLC_FALSE );
add_integer( "spu-channel", -1, NULL,
INPUT_SUB_TEXT, INPUT_SUB_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_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 );
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 );
+
/* Decoder options */
add_category_hint( N_("Decoders"), CODEC_CAT_LONGTEXT , VLC_TRUE );
add_module( "codec", "decoder", NULL, NULL, CODEC_TEXT,
set_subcategory( SUBCAT_INTERFACE_GENERAL );
set_section ( N_("Interface module" ), NULL );
- add_module( "intf", "interface", NULL, NULL, INTF_TEXT,
+ add_module_cat( "intf", SUBCAT_INTERFACE_GENERAL, NULL, NULL, INTF_TEXT,
INTF_LONGTEXT, VLC_FALSE );
change_short('I');
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 );
{ "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