"controller after x milliseconds")
#define MOUSE_HIDE_TIMEOUT_LONGTEXT N_( \
"Hide mouse cursor and fullscreen controller after " \
- "n milliseconds, default is 3000 ms (3 sec.)")
+ "n milliseconds.")
#define DEINTERLACE_TEXT N_("Deinterlace")
#define DEINTERLACE_LONGTEXT N_(\
#define INPUT_SUBTRACK_ID_LONGTEXT N_( \
"Stream ID of the subtitle track to use.")
+#define INPUT_PREFERREDRESOLUTION_TEXT N_("Preferred video resolution")
+#define INPUT_PREFERREDRESOLUTION_LONGTEXT N_( \
+ "When several video formats are available, select one whose " \
+ "resolution is closest to (but not higher than) this setting, " \
+ "in number of lines. Use this option if you don't have enough CPU " \
+ "power or network bandwith to play higher resolutions.")
+static const int pi_prefres[] = { -1, 1080, 720, 576, 320 };
+static const char *const ppsz_prefres[] = {
+ N_("Best available"), N_("Full HD (1080p)"), N_("HD (720p)"),
+ N_("Standard Definition (576 or 480 lines)"),
+ N_("Low definition (320 lines)")
+};
+
#define INPUT_REPEAT_TEXT N_("Input repetitions")
#define INPUT_REPEAT_LONGTEXT N_( \
"Number of time the same input will be repeated")
#define RTSP_PORT_TEXT N_( "RTSP server port" )
#define RTSP_PORT_LONGTEXT N_( \
- "The HTTPS server will listen on this TCP port. " \
+ "The RTSP server will listen on this TCP port. " \
"The standard RTSP port number is 554. " \
"However allocation of port numbers below 1025 is usually restricted " \
"by the operating system." )
#define SCALE_DOWN_KEY_LONGTEXT N_("Decrease scale factor.")
#define DEINTERLACE_KEY_TEXT N_("Cycle deinterlace modes")
#define DEINTERLACE_KEY_LONGTEXT N_("Cycle through deinterlace modes.")
+#define INTF_TOGGLE_FSC_KEY_TEXT N_("Show controller in fullscreen")
#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 INTF_BOSS_KEY_TEXT N_("Boss key")
+#define INTF_BOSS_KEY_LONGTEXT N_("Hide the interface and pause playback.")
#define SNAP_KEY_TEXT N_("Take video snapshot")
#define SNAP_KEY_LONGTEXT N_("Takes a video snapshot and writes it to disk.")
change_safe ()
add_bool( "embedded-video", 1, EMBEDDED_TEXT, EMBEDDED_LONGTEXT,
true )
-#ifdef __APPLE__
- add_deprecated_alias( "macosx-embedded" ) /*deprecated since 0.9.0 */
-#endif
add_bool( "xlib", true, "", "", true )
change_private ()
add_bool( "drop-late-frames", 1, DROP_LATE_FRAMES_TEXT,
VIDEO_ON_TOP_LONGTEXT, false )
add_bool( "video-wallpaper", false, WALLPAPER_TEXT,
WALLPAPER_LONGTEXT, false )
-#ifdef WIN32
- add_deprecated_alias( "directx-wallpaper" )
-#endif
add_bool( "disable-screensaver", true, SS_TEXT, SS_LONGTEXT,
true )
VIDEO_TITLE_POSITION_LONGTEXT, false )
change_safe()
change_integer_list( pi_pos_values, ppsz_pos_descriptions )
- // autohide after 1.5s
- add_integer( "mouse-hide-timeout", 1500, MOUSE_HIDE_TIMEOUT_TEXT,
+ // autohide after 1 second
+ add_integer( "mouse-hide-timeout", 1000, MOUSE_HIDE_TIMEOUT_TEXT,
MOUSE_HIDE_TIMEOUT_LONGTEXT, false )
set_section( N_("Snapshot") , NULL )
add_directory( "snapshot-path", NULL, SNAP_PATH_TEXT,
VIDEO_FILTER_TEXT, VIDEO_FILTER_LONGTEXT, false )
add_module_list_cat( "video-splitter", SUBCAT_VIDEO_VFILTER, NULL,
VIDEO_SPLITTER_TEXT, VIDEO_SPLITTER_LONGTEXT, false )
- add_deprecated_alias( "vout-filter" )
+ add_obsolete_string( "vout-filter" ) /* since 1.2.0 */
#if 0
add_string( "pixel-ratio", "1", PIXEL_RATIO_TEXT, PIXEL_RATIO_TEXT )
#endif
add_integer( "sub-track-id", -1,
INPUT_SUBTRACK_ID_TEXT, INPUT_SUBTRACK_ID_LONGTEXT, true )
change_safe ()
+ add_integer( "preferred-resolution", -1, INPUT_PREFERREDRESOLUTION_TEXT,
+ INPUT_PREFERREDRESOLUTION_LONGTEXT, false )
+ change_safe ()
+ change_integer_list( pi_prefres, ppsz_prefres )
set_section( N_( "Playback control" ) , NULL)
add_integer( "input-repeat", 0,
add_integer( "rtsp-port", 8554, RTSP_PORT_TEXT, RTSP_PORT_LONGTEXT, true )
change_integer_range( 1, 65535 )
add_loadfile( "http-cert", NULL, HTTP_CERT_TEXT, CERT_LONGTEXT, true )
- add_deprecated_alias( "sout-http-cert" ) /* since 1.2.0 */
+ add_obsolete_string( "sout-http-cert" ) /* since 1.2.0 */
add_loadfile( "http-key", NULL, HTTP_KEY_TEXT, KEY_LONGTEXT, true )
- add_deprecated_alias( "sout-http-key" ) /* since 1.2.0 */
+ add_obsolete_string( "sout-http-key" ) /* since 1.2.0 */
add_loadfile( "http-ca", NULL, HTTP_CA_TEXT, CA_LONGTEXT, true )
- add_deprecated_alias( "sout-http-ca" ) /* since 1.2.0 */
+ add_obsolete_string( "sout-http-ca" ) /* since 1.2.0 */
add_loadfile( "http-crl", NULL, HTTP_CRL_TEXT, CRL_LONGTEXT, true )
- add_deprecated_alias( "sout-http-crl" ) /* since 1.2.0 */
+ add_obsolete_string( "sout-http-crl" ) /* since 1.2.0 */
set_section( N_( "Socks proxy") , NULL )
add_string( "socks", NULL,
CACHING_TEXT, CACHING_LONGTEXT, true )
change_integer_range( 0, 60000 )
change_safe()
+ add_obsolete_integer( "vdr-caching" ) /* 1.2.0 */
add_integer( "live-caching", DEFAULT_PTS_DELAY / 1000,
CAPTURE_CACHING_TEXT, CAPTURE_CACHING_LONGTEXT, true )
change_integer_range( 0, 60000 )
change_safe()
+ add_obsolete_integer( "alsa-caching" ) /* 1.2.0 */
+ add_obsolete_integer( "dshow-caching" ) /* 1.2.0 */
+ add_obsolete_integer( "dv-caching" ) /* 1.2.0 */
+ add_obsolete_integer( "dvb-caching" ) /* 1.2.0 */
+ add_obsolete_integer( "eyetv-caching" ) /* 1.2.0 */
+ add_obsolete_integer( "gnomevfs-caching" ) /* 1.2.0 */
+ add_obsolete_integer( "jack-input-caching" ) /* 1.2.0 */
+ add_obsolete_integer( "linsys-hdsdi-caching" ) /* 1.2.0 */
+ add_obsolete_integer( "linsys-sdi-caching" ) /* 1.2.0 */
+ add_obsolete_integer( "oss-caching" ) /* 1.2.0 */
+ add_obsolete_integer( "pvr-caching" ) /* 1.2.0 */
+ add_obsolete_integer( "screen-caching" ) /* 1.2.0 */
+ add_obsolete_integer( "v4l2-caching" ) /* 1.2.0 */
add_integer( "disc-caching", DEFAULT_PTS_DELAY / 1000,
DISC_CACHING_TEXT, DISC_CACHING_LONGTEXT, true )
change_integer_range( 0, 60000 )
change_safe()
+ add_obsolete_integer( "bd-caching" ) /* 1.2.0 */
+ add_obsolete_integer( "bluray-caching" ) /* 1.2.0 */
+ add_obsolete_integer( "cdda-caching" ) /* 1.2.0 */
+ add_obsolete_integer( "dvdnav-caching" ) /* 1.2.0 */
+ add_obsolete_integer( "dvdread-caching" ) /* 1.2.0 */
+ add_obsolete_integer( "vcd-caching" ) /* 1.2.0 */
add_integer( "network-caching", CLOCK_FREQ / 1000,
NETWORK_CACHING_TEXT, NETWORK_CACHING_LONGTEXT, true )
change_integer_range( 0, 60000 )
change_safe()
+ add_obsolete_integer( "ftp-caching" ) /* 1.2.0 */
+ add_obsolete_integer( "http-caching" ) /* 1.2.0 */
+ add_obsolete_integer( "mms-caching" ) /* 1.2.0 */
+ add_obsolete_integer( "realrtsp-caching" ) /* 1.2.0 */
+ add_obsolete_integer( "rtp-caching" ) /* 1.2.0 */
+ add_obsolete_integer( "rtsp-caching" ) /* 1.2.0 */
+ add_obsolete_integer( "sftp-caching" ) /* 1.2.0 */
+ add_obsolete_integer( "smb-caching" ) /* 1.2.0 */
+ add_obsolete_integer( "tcp-caching" ) /* 1.2.0 */
+ add_obsolete_integer( "udp-caching" ) /* 1.2.0 */
add_integer( "cr-average", 40, CR_AVERAGE_TEXT,
CR_AVERAGE_LONGTEXT, true )
PLAYLISTENQUEUE_LONGTEXT, true )
#endif
-#if defined(WIN32)
+#if defined(WIN32) || defined(__OS2__)
add_bool( "high-priority", 0, HPRIORITY_TEXT,
HPRIORITY_LONGTEXT, false )
#endif
add_bool( "quiet", 0, QUIET_TEXT, QUIET_LONGTEXT, false )
change_short('q')
-#if !defined(WIN32)
+#if !defined(WIN32) && !defined(__OS2__)
add_bool( "daemon", 0, DAEMON_TEXT, DAEMON_LONGTEXT, true )
change_short('d')
# define KEY_SCALE_UP "Alt+o"
# define KEY_SCALE_DOWN "Shift+Alt+o"
# define KEY_DEINTERLACE "d"
-# define KEY_INTF_SHOW "i"
-# define KEY_INTF_HIDE "Shift+i"
+# define KEY_INTF_TOGGLE_FSC "i"
+# define KEY_INTF_BOSS NULL
# define KEY_DISC_MENU "Ctrl+m"
# define KEY_TITLE_PREV "Ctrl+p"
# define KEY_TITLE_NEXT "Ctrl+n"
# define KEY_SCALE_UP "Alt+o"
# define KEY_SCALE_DOWN "Alt+Shift+o"
# define KEY_DEINTERLACE "d"
-# define KEY_INTF_SHOW "i"
-# define KEY_INTF_HIDE "Shift+i"
+# define KEY_INTF_TOGGLE_FSC "i"
+# define KEY_INTF_BOSS NULL
# define KEY_DISC_MENU "Shift+m"
# define KEY_TITLE_PREV "Shift+o"
# define KEY_TITLE_NEXT "Shift+b"
add_key( "key-toggle-fullscreen", KEY_TOGGLE_FULLSCREEN, TOGGLE_FULLSCREEN_KEY_TEXT,
TOGGLE_FULLSCREEN_KEY_LONGTEXT, false )
- add_deprecated_alias( "key-fullscreen" ) /*deprecated since 0.9.0 */
add_key( "key-leave-fullscreen", KEY_LEAVE_FULLSCREEN, LEAVE_FULLSCREEN_KEY_TEXT,
LEAVE_FULLSCREEN_KEY_LONGTEXT, false )
add_key( "key-play-pause", KEY_PLAY_PAUSE, PLAY_PAUSE_KEY_TEXT,
SCALE_DOWN_KEY_TEXT, SCALE_DOWN_KEY_LONGTEXT, false )
add_key( "key-deinterlace", KEY_DEINTERLACE,
DEINTERLACE_KEY_TEXT, DEINTERLACE_KEY_LONGTEXT, false )
- add_key( "key-intf-show", KEY_INTF_SHOW,
- INTF_SHOW_KEY_TEXT, INTF_SHOW_KEY_LONGTEXT, true )
- add_key( "key-intf-hide", KEY_INTF_HIDE,
- INTF_HIDE_KEY_TEXT, INTF_HIDE_KEY_LONGTEXT, true )
+ add_key( "key-intf-show", KEY_INTF_TOGGLE_FSC,
+ INTF_TOGGLE_FSC_KEY_TEXT, INTF_TOGGLE_FSC_KEY_TEXT, false )
+ add_obsolete_inner( "key-intf-hide", CONFIG_ITEM_KEY )
+
+ add_key( "key-intf-boss", KEY_INTF_BOSS,
+ INTF_BOSS_KEY_TEXT, INTF_BOSS_KEY_LONGTEXT, true )
add_key( "key-snapshot", KEY_SNAPSHOT,
SNAP_KEY_TEXT, SNAP_KEY_LONGTEXT, true )
add_key( "key-record", KEY_RECORD,
projects / vlc / blobdiff