"subsystem, such as the DVD or VCD device, the network interface " \
"settings or the subtitle channel.")
+#define CACHING_TEXT N_("File caching (ms)")
+#define CACHING_LONGTEXT N_( \
+ "Caching value for local files, in milliseconds." )
+
+#define CAPTURE_CACHING_TEXT N_("Live capture caching (ms)")
+#define CAPTURE_CACHING_LONGTEXT N_( \
+ "Caching value for cameras and microphones, in milliseconds." )
+
+#define DISC_CACHING_TEXT N_("Disc caching (ms)")
+#define DISC_CACHING_LONGTEXT N_( \
+ "Caching value for optical media, in milliseconds." )
+
+#define NETWORK_CACHING_TEXT N_("Network caching (ms)")
+#define NETWORK_CACHING_LONGTEXT N_( \
+ "Caching value for network resources, in milliseconds." )
+
#define CR_AVERAGE_TEXT N_("Clock reference average counter")
#define CR_AVERAGE_LONGTEXT N_( \
"When using the PVR input (or a very irregular source), you should " \
#define MIFACE_LONGTEXT N_( \
"Default multicast interface. This overrides the routing table.")
-#define MIFACE_ADDR_TEXT N_("IPv4 multicast output interface address")
-#define MIFACE_ADDR_LONGTEXT N_( \
- "IPv4 address for the default multicast interface. This overrides " \
- "the routing table.")
-
#define DSCP_TEXT N_("DiffServ Code Point")
#define DSCP_LONGTEXT N_("Differentiated Services Code Point " \
"for outgoing UDP streams (or IPv4 Type Of Service, " \
#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")
"These options allow you to enable special CPU optimizations. " \
"You should always leave all these enabled." )
-#define MMX_TEXT N_("Enable CPU MMX support")
-#define MMX_LONGTEXT N_( \
- "If your processor supports the MMX instructions set, VLC can take " \
- "advantage of them.")
-
-#define THREE_DN_TEXT N_("Enable CPU 3D Now! support")
-#define THREE_DN_LONGTEXT N_( \
- "If your processor supports the 3D Now! instructions set, VLC can take " \
- "advantage of them.")
-
-#define MMXEXT_TEXT N_("Enable CPU MMX EXT support")
-#define MMXEXT_LONGTEXT N_( \
- "If your processor supports the MMX EXT instructions set, VLC can take " \
- "advantage of them.")
-
-#define SSE_TEXT N_("Enable CPU SSE support")
-#define SSE_LONGTEXT N_( \
- "If your processor supports the SSE instructions set, VLC can take " \
- "advantage of them.")
-
-#define SSE2_TEXT N_("Enable CPU SSE2 support")
-#define SSE2_LONGTEXT N_( \
- "If your processor supports the SSE2 instructions set, VLC can take " \
- "advantage of them.")
-
-#define SSE3_TEXT N_("Enable CPU SSE3 support")
-#define SSE3_LONGTEXT N_( \
- "If your processor supports the SSE3 instructions set, VLC can take " \
- "advantage of them.")
-
-#define SSSE3_TEXT N_("Enable CPU SSSE3 support")
-#define SSSE3_LONGTEXT N_( \
- "If your processor supports the SSSE3 instructions set, VLC can take " \
- "advantage of them.")
-
-#define SSE4_1_TEXT N_("Enable CPU SSE4.1 support")
-#define SSE4_1_LONGTEXT N_( \
- "If your processor supports the SSE4.1 instructions set, VLC can take " \
- "advantage of them.")
-
-#define SSE4_2_TEXT N_("Enable CPU SSE4.2 support")
-#define SSE4_2_LONGTEXT N_( \
- "If your processor supports the SSE4.2 instructions set, VLC can take " \
- "advantage of them.")
-
-#define ALTIVEC_TEXT N_("Enable CPU AltiVec support")
-#define ALTIVEC_LONGTEXT N_( \
- "If your processor supports the AltiVec instructions set, VLC can take " \
- "advantage of them.")
-
// DEPRECATED
#define MISC_CAT_LONGTEXT N_( \
"These options allow you to select default modules. Leave these " \
#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.")
#define AUDI_DEVICE_CYCLE_KEY_TEXT N_("Cycle through audio devices")
#define AUDI_DEVICE_CYCLE_KEY_LONGTEXT N_("Cycle through available audio devices")
-const char vlc_usage[] = N_(
- "Usage: %s [options] [stream] ..."
- "\nYou can specify multiple streams 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 stream directly before it"
- "\n and that overrides previous settings."
- "\n"
- "\nStream 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 http://ip:port/file HTTP URL"
- "\n ftp://ip:port/file FTP URL"
- "\n mms://ip:port/file MMS URL"
- "\n screen:// Screen capture"
- "\n [dvd://][device][@raw_device] DVD device"
- "\n [vcd://][device] VCD device"
- "\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:<seconds> Special item to pause the playlist for a certain time"
- "\n vlc://quit Special item to quit VLC"
- "\n");
/*
* Quick usage guide for the configuration options:
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,
set_section( N_( "Advanced" ), NULL )
+ add_integer( "file-caching", DEFAULT_PTS_DELAY / 1000,
+ CACHING_TEXT, CACHING_LONGTEXT, true )
+ change_integer_range( 0, 60000 )
+ change_safe()
+ add_integer( "live-caching", DEFAULT_PTS_DELAY / 1000,
+ CAPTURE_CACHING_TEXT, CAPTURE_CACHING_LONGTEXT, true )
+ change_integer_range( 0, 60000 )
+ change_safe()
+#if defined (__linux__)
+ add_deprecated_alias( "v4l2-caching" ) /* 1.2.0 */
+#elif defined (WIN32)
+ add_deprecated_alias( "dshow-caching" ) /* 1.2.0 */
+#endif
+ add_integer( "disc-caching", DEFAULT_PTS_DELAY / 1000,
+ DISC_CACHING_TEXT, DISC_CACHING_LONGTEXT, true )
+ change_integer_range( 0, 60000 )
+ change_safe()
+ add_deprecated_alias( "dvdnav-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_deprecated_alias( "http-caching" ) /* 1.2.0 */
+
add_integer( "cr-average", 40, CR_AVERAGE_TEXT,
CR_AVERAGE_LONGTEXT, true )
add_integer( "clock-synchro", -1, CLOCK_SYNCHRO_TEXT,
ACCESS_OUTPUT_TEXT, ACCESS_OUTPUT_LONGTEXT, true )
add_integer( "ttl", -1, TTL_TEXT, TTL_LONGTEXT, true )
add_string( "miface", NULL, MIFACE_TEXT, MIFACE_LONGTEXT, true )
- add_string( "miface-addr", NULL, MIFACE_ADDR_TEXT, MIFACE_ADDR_LONGTEXT, true )
+ add_obsolete_string( "miface-addr" )
add_integer( "dscp", 0, DSCP_TEXT, DSCP_LONGTEXT, true )
set_subcategory( SUBCAT_SOUT_PACKETIZER )
add_category_hint( N_("CPU"), CPU_CAT_LONGTEXT, true )
add_obsolete_bool( "fpu" )
#if defined( __i386__ ) || defined( __x86_64__ )
- add_bool( "mmx", 1, MMX_TEXT, MMX_LONGTEXT, true )
- add_bool( "3dn", 1, THREE_DN_TEXT, THREE_DN_LONGTEXT, true )
- add_bool( "mmxext", 1, MMXEXT_TEXT, MMXEXT_LONGTEXT, true )
- add_bool( "sse", 1, SSE_TEXT, SSE_LONGTEXT, true )
- add_bool( "sse2", 1, SSE2_TEXT, SSE2_LONGTEXT, true )
- add_bool( "sse3", 1, SSE3_TEXT, SSE3_LONGTEXT, true )
- add_bool( "ssse3", 1, SSSE3_TEXT, SSSE3_LONGTEXT, true )
- add_bool( "sse41", 1, SSE4_1_TEXT, SSE4_1_LONGTEXT, true )
- add_bool( "sse42", 1, SSE4_2_TEXT, SSE4_2_LONGTEXT, true )
+ add_obsolete_bool( "mmx" ) /* since 1.2.0 */
+ add_obsolete_bool( "3dn" ) /* since 1.2.0 */
+ add_obsolete_bool( "mmxext" ) /* since 1.2.0 */
+ add_obsolete_bool( "sse" ) /* since 1.2.0 */
+ add_obsolete_bool( "sse2" ) /* since 1.2.0 */
+ add_obsolete_bool( "sse3" ) /* since 1.2.0 */
+ add_obsolete_bool( "ssse3" ) /* since 1.2.0 */
+ add_obsolete_bool( "sse41" ) /* since 1.2.0 */
+ add_obsolete_bool( "sse42" ) /* since 1.2.0 */
#endif
#if defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ )
- add_bool( "altivec", 1, ALTIVEC_TEXT, ALTIVEC_LONGTEXT, true )
+ add_obsolete_bool( "altivec" ) /* since 1.2.0 */
#endif
/* Misc options */
# define KEY_DEINTERLACE "d"
# define KEY_INTF_SHOW "i"
# define KEY_INTF_HIDE "Shift+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_DEINTERLACE "d"
# define KEY_INTF_SHOW "i"
# define KEY_INTF_HIDE "Shift+i"
+# define KEY_INTF_BOSS NULL
# define KEY_DISC_MENU "Shift+m"
# define KEY_TITLE_PREV "Shift+o"
# define KEY_TITLE_NEXT "Shift+b"
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-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