#if defined (WIN32) || defined (__APPLE__)
static const char *ppsz_language[] =
{ "auto", "ar", "en", "en_GB", "ca", "cs", "da", "de", "es", "fa" "fr", "gl",
- "he", "hu", "it", "ja", "ka", "ko", "ms", "nl", "oc", "pt_BR", "ro", "ru",
- "sk", "sl", "sv", "tr", "zh_CN", "zh_TW" };
+ "he", "hu", "it", "ja", "ka", "ko", "ms", "nl", "oc", "pl", "pt_BR", "ro",
+ "ru", "sk", "sl", "sv", "tr", "zh_CN", "zh_TW" };
static const char *ppsz_language_text[] =
{ N_("Auto"), N_("Arabic"), N_("American English"), N_("British English"),
N_("Catalan"), N_("Czech"), N_("Danish"), N_("German"), N_("Spanish"),
N_("Persian"), N_("French"), N_("Galician"), N_("Hebrew"), N_("Hungarian"),
N_("Italian"), N_("Japanese"),N_("Georgian"), N_("Korean"), N_("Malay"),
-N_("Dutch"), N_("Occitan"), N_("Brazilian Portuguese"), N_("Romanian"),
-N_("Russian"), N_("Slovak"), N_("Slovenian"), N_("Swedish"), N_("Turkish"),
-N_("Simplified Chinese"), N_("Chinese Traditional") };
+N_("Dutch"), N_("Occitan"), N_("Polish"), N_("Brazilian Portuguese"),
+N_("Romanian"), N_("Russian"), N_("Slovak"), N_("Slovenian"), N_("Swedish"),
+N_("Turkish"), N_("Simplified Chinese"), N_("Chinese Traditional") };
#endif
static const char *ppsz_snap_formats[] =
#define MTU_TEXT N_("MTU of the network interface")
#define MTU_LONGTEXT N_( \
- "This is the maximum packet size that can be transmitted " \
- "over the network interface. On Ethernet it is usually 1500 bytes.")
+ "This is the maximum application-layer packet size that can be " \
+ "transmitted over the network (in bytes).")
+/* Should be less than 1500 - 8[ppp] - 40[ip6] - 8[udp] in any case. */
+#define MTU_DEFAULT 1400
#define TTL_TEXT N_("Hop limit (TTL)")
#define TTL_LONGTEXT N_( \
"Toggle wallpaper mode in video output. Only works with the directx " \
"video output for the time being." )
+#define MENU_ON_KEY_TEXT N_("Display OSD menu on top of video output")
+#define MENU_ON_KEY_LONGTEXT N_("Display OSDmenu on top of video output")
+#define MENU_OFF_KEY_TEXT N_("Do not display OSD menu on video output")
+#define MENU_OFF_KEY_LONGTEXT N_("Do not display OSDmenu on top of video output")
+#define MENU_RIGHT_KEY_TEXT N_("Highlight widget on the right")
+#define MENU_RIGHT_KEY_LONGTEXT N_( \
+ "Move OSD menu highlight to the widget on the right")
+#define MENU_LEFT_KEY_TEXT N_("Highlight widget on the left")
+#define MENU_LEFT_KEY_LONGTEXT N_( \
+ "Move OSD menu highlight to the widget on the left")
+#define MENU_UP_KEY_TEXT N_("Highlight widget on top")
+#define MENU_UP_KEY_LONGTEXT N_( \
+ "Move OSD menu highlight to the widget on top")
+#define MENU_DOWN_KEY_TEXT N_("Highlight widget below")
+#define MENU_DOWN_KEY_LONGTEXT N_( \
+ "Move OSD menu highlight to the widget below")
+#define MENU_SELECT_KEY_TEXT N_("Select current widget")
+#define MENU_SELECT_KEY_LONGTEXT N_( \
+ "Selecting current widget performs the associated action.")
+
const char vlc_usage[] = N_(
"Usage: %s [options] [stream] ..."
"\nYou can specify multiple streams on the commandline. They will be enqueued in the playlist."
set_subcategory( SUBCAT_VIDEO_VFILTER );
add_module_list_cat( "video-filter", SUBCAT_VIDEO_VFILTER, NULL, NULL,
VIDEO_FILTER_TEXT, VIDEO_FILTER_LONGTEXT, VLC_FALSE );
- add_deprecated( "filter", VLC_FALSE ); /*deprecated since 0.8.2 */
-// add_deprecated( "vout-filter", VLC_FALSE ); /* deprecated since 0.8.6 *// While the "video-filter" chain isn't parsed for both vfilter and vfilter2, keep both options
+ add_deprecated_alias( "filter" ); /*deprecated since 0.8.2 */
+// add_deprecated_alias( "vout-filter" ); /* deprecated since 0.8.6 *// While the "video-filter" chain isn't parsed for both vfilter and vfilter2, keep both options
add_module_list_cat( "vout-filter", SUBCAT_VIDEO_VFILTER, NULL, NULL,
NULL, NULL, VLC_FALSE );
#if 0
SUB_PATH_TEXT, SUB_PATH_LONGTEXT, VLC_TRUE );
add_integer( "sub-margin", 0, NULL, SUB_MARGIN_TEXT,
SUB_MARGIN_LONGTEXT, VLC_TRUE );
- add_deprecated( "spu-margin", VLC_FALSE ); /*Deprecated since 0.8.2 */
+ add_deprecated_alias( "spu-margin" ); /*Deprecated since 0.8.2 */
set_section( N_( "Overlays" ) , NULL );
add_module_list_cat( "sub-filter", SUBCAT_VIDEO_SUBPIC, NULL, NULL,
SUB_FILTER_TEXT, SUB_FILTER_LONGTEXT, 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_deprecated_alias( "audio-channel" ); /*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_deprecated_alias("spu-channel" ); /*deprecated since 0.8.2*/
add_string( "audio-language", "", NULL,
INPUT_AUDIOTRACK_LANG_TEXT, INPUT_AUDIOTRACK_LANG_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_integer( "mtu", MTU_DEFAULT, NULL, MTU_TEXT, MTU_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 );
# define KEY_DUMP KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'d'
# define KEY_WALLPAPER KEY_MODIFIER_COMMAND|'w'
+# define KEY_MENU_ON KEY_MODIFIER_ALT|'m'
+# define KEY_MENU_OFF KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'m'
+# define KEY_MENU_RIGHT KEY_MODIFIER_ALT|KEY_RIGHT
+# define KEY_MENU_LEFT KEY_MODIFIER_ALT|KEY_LEFT
+# define KEY_MENU_UP KEY_MODIFIER_ALT|KEY_UP
+# define KEY_MENU_DOWN KEY_MODIFIER_ALT|KEY_DOWN
+# define KEY_MENU_SELECT KEY_MODIFIER_ALT|KEY_ENTER
+
#else
# define KEY_TOGGLE_FULLSCREEN 'f'
# define KEY_LEAVE_FULLSCREEN KEY_ESC
# define KEY_VOL_UP KEY_MODIFIER_CTRL|KEY_UP
# define KEY_VOL_DOWN KEY_MODIFIER_CTRL|KEY_DOWN
# 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_SUBDELAY_UP 'h'
+# define KEY_SUBDELAY_DOWN 'g'
+# define KEY_AUDIODELAY_UP 'k'
+# define KEY_AUDIODELAY_DOWN 'j'
# define KEY_RANDOM 'r'
-# define KEY_LOOP KEY_MODIFIER_SHIFT|'l'
+# define KEY_LOOP 'l'
-# define KEY_AUDIO_TRACK 'l'
-# define KEY_SUBTITLE_TRACK 'k'
+# define KEY_AUDIO_TRACK 'b'
+# define KEY_SUBTITLE_TRACK 'v'
# define KEY_ASPECT_RATIO 'a'
# define KEY_CROP 'c'
# define KEY_DEINTERLACE 'd'
# 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|'f'
-# define KEY_CHAPTER_PREV KEY_MODIFIER_CTRL|'u'
-# define KEY_CHAPTER_NEXT KEY_MODIFIER_CTRL|'d'
+# define KEY_DISC_MENU KEY_MODIFIER_ALT|'r'
+# define KEY_TITLE_PREV KEY_MODIFIER_ALT|'o'
+# define KEY_TITLE_NEXT KEY_MODIFIER_ALT|'b'
+# define KEY_CHAPTER_PREV KEY_MODIFIER_ALT|'p'
+# define KEY_CHAPTER_NEXT KEY_MODIFIER_ALT|'n'
# define KEY_SNAPSHOT KEY_MODIFIER_CTRL|KEY_MODIFIER_ALT|'s'
+
# define KEY_ZOOM 'z'
# define KEY_UNZOOM KEY_MODIFIER_SHIFT|'z'
# 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|'v'
-# define KEY_HISTORY_FORWARD KEY_MODIFIER_CTRL|'b'
-# define KEY_RECORD KEY_MODIFIER_CTRL|'r'
+# define KEY_HISTORY_BACK KEY_MODIFIER_ALT|'g'
+# define KEY_HISTORY_FORWARD KEY_MODIFIER_ALT|'h'
+# define KEY_RECORD KEY_MODIFIER_CTRL|KEY_MODIFIER_SHIFT|'r'
# define KEY_DUMP KEY_MODIFIER_CTRL|KEY_MODIFIER_SHIFT|'d'
# define KEY_WALLPAPER 'w'
+
+# define KEY_MENU_ON KEY_MODIFIER_ALT|'m'
+# define KEY_MENU_OFF KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'m'
+# define KEY_MENU_RIGHT KEY_MODIFIER_ALT|KEY_RIGHT
+# define KEY_MENU_LEFT KEY_MODIFIER_ALT|KEY_LEFT
+# define KEY_MENU_UP KEY_MODIFIER_ALT|KEY_UP
+# define KEY_MENU_DOWN KEY_MODIFIER_ALT|KEY_DOWN
+# define KEY_MENU_SELECT KEY_MODIFIER_ALT|KEY_ENTER
#endif
add_key( "key-toggle-fullscreen", KEY_TOGGLE_FULLSCREEN, NULL, TOGGLE_FULLSCREEN_KEY_TEXT,
TOGGLE_FULLSCREEN_KEY_LONGTEXT, VLC_FALSE );
- add_deprecated( "key-fullscreen", VLC_FALSE ); /*deprecated since 0.9.0 */
+ add_deprecated_alias( "key-fullscreen" ); /*deprecated since 0.9.0 */
add_key( "key-leave-fullscreen", KEY_LEAVE_FULLSCREEN, NULL, LEAVE_FULLSCREEN_KEY_TEXT,
LEAVE_FULLSCREEN_KEY_LONGTEXT, VLC_FALSE );
add_key( "key-play-pause", KEY_PLAY_PAUSE, NULL, PLAY_PAUSE_KEY_TEXT,
add_key( "key-wallpaper", KEY_WALLPAPER, NULL, WALLPAPER_KEY_TEXT,
WALLPAPER_KEY_LONGTEXT, VLC_FALSE );
+ add_key( "key-menu-on", KEY_MENU_ON, NULL,
+ MENU_ON_KEY_TEXT, MENU_ON_KEY_LONGTEXT, VLC_TRUE );
+ add_key( "key-menu-off", KEY_MENU_OFF, NULL,
+ MENU_OFF_KEY_TEXT, MENU_OFF_KEY_LONGTEXT, VLC_TRUE );
+ add_key( "key-menu-right", KEY_MENU_RIGHT, NULL,
+ MENU_RIGHT_KEY_TEXT, MENU_RIGHT_KEY_LONGTEXT, VLC_TRUE );
+ add_key( "key-menu-left", KEY_MENU_LEFT, NULL,
+ MENU_LEFT_KEY_TEXT, MENU_LEFT_KEY_LONGTEXT, VLC_TRUE );
+ add_key( "key-menu-up", KEY_MENU_UP, NULL,
+ MENU_UP_KEY_TEXT, MENU_UP_KEY_LONGTEXT, VLC_TRUE );
+ add_key( "key-menu-down", KEY_MENU_DOWN, NULL,
+ MENU_DOWN_KEY_TEXT, MENU_DOWN_KEY_LONGTEXT, VLC_TRUE );
+ add_key( "key-menu-select", KEY_MENU_SELECT, NULL,
+ MENU_SELECT_KEY_TEXT, MENU_SELECT_KEY_LONGTEXT, VLC_TRUE );
+
add_key( "key-crop-top", KEY_CROP_TOP, NULL,
CROP_TOP_KEY_TEXT, CROP_TOP_KEY_LONGTEXT, VLC_TRUE );
add_key( "key-uncrop-top", KEY_UNCROP_TOP, NULL,
projects / vlc / blobdiff