#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", "pl", "pt_BR", "ro",
- "ru", "sk", "sl", "sv", "tr", "zh_CN", "zh_TW" };
+{
+ "auto",
+ "en",
+ "ar",
+ "pt_BR",
+ "en_GB",
+ "ca",
+ "zh_TW",
+ "cs",
+ "da",
+ "nl",
+ "fi",
+ "fr",
+ "gl",
+ "ka",
+ "de",
+ "he",
+ "hu",
+ "it",
+ "ja",
+ "ko",
+ "ms",
+ "oc",
+ "fa",
+ "pl",
+ "ro",
+ "ru",
+ "zh_CN",
+ "sk",
+ "sl",
+ "es",
+ "sv",
+ "tr"
+};
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_("Polish"), N_("Brazilian Portuguese"),
-N_("Romanian"), N_("Russian"), N_("Slovak"), N_("Slovenian"), N_("Swedish"),
-N_("Turkish"), N_("Simplified Chinese"), N_("Chinese Traditional") };
+{
+ N_("Auto"),
+ N_("American English"),
+ N_("Arabic"),
+ N_("Brazilian Portuguese"),
+ N_("British English"),
+ N_("Catalan"),
+ N_("Chinese Traditional"),
+ N_("Czech"),
+ N_("Danish"),
+ N_("Dutch"),
+ N_("Finnish"),
+ N_("French"),
+ N_("Galician"),
+ N_("Georgian"),
+ N_("German"),
+ N_("Hebrew"),
+ N_("Hungarian"),
+ N_("Italian"),
+ N_("Japanese"),
+ N_("Korean"),
+ N_("Malay"),
+ N_("Occitan"),
+ N_("Persian"),
+ N_("Polish"),
+ N_("Romanian"),
+ N_("Russian"),
+ N_("Simplified Chinese"),
+ N_("Slovak"),
+ N_("Slovenian"),
+ N_("Spanish"),
+ N_("Swedish"),
+ N_("Turkish")
+};
#endif
static const char *ppsz_snap_formats[] =
#define SS_TEXT N_("Disable screensaver")
#define SS_LONGTEXT N_("Disable the screensaver during video playback." )
+#define INHIBIT_TEXT N_("Inhibits the power management daemon during playback.")
+#define INHIBIT_LONGTEXT N_("Inhibits the power management daemon during any " \
+ "playback, to avoid the computer being suspended because of inactivity.")
+
#define VIDEO_DECO_TEXT N_("Window decorations")
#define VIDEO_DECO_LONGTEXT N_( \
"VLC can avoid creating window caption, frames, etc... around the video" \
#define SNAP_SEQUENTIAL_LONGTEXT N_( \
"Use sequential numbers instead of timestamps for snapshot numbering")
+#define SNAP_WIDTH_TEXT N_("Video snapshot width")
+#define SNAP_WIDTH_LONGTEXT N_( \
+ "You can enforce the width of the video snapshot. By default " \
+ "it will be 320 pixels." )
+
+#define SNAP_HEIGHT_TEXT N_("Video snapshot height")
+#define SNAP_HEIGHT_LONGTEXT N_( \
+ "You can enforce the height of the video snapshot. By default " \
+ "it will be 200 pixels." )
+
#define CROP_TEXT N_("Video cropping")
#define CROP_LONGTEXT N_( \
"This forces the cropping of the source video. " \
#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_( \
"multiple playlist item (automatically insert the gather stream output " \
"if not specified)" )
+#define SOUT_MUX_CACHING_TEXT N_("Stream output muxer caching (ms)")
+#define SOUT_MUX_CACHING_LONGTEXT N_( \
+ "This allow you to configure the initial caching amount for stream output " \
+ " muxer. This value should be set in milliseconds." )
+
#define PACKETIZER_TEXT N_("Preferred packetizer list")
#define PACKETIZER_LONGTEXT N_( \
"This allows you to select the order in which VLC will choose its " \
"Automatically preparse files added to the playlist " \
"(to retrieve some metadata)." )
+#define FETCH_META_TEXT N_( "Autorise meta information fetching" )
+#define FETCH_META_LONGTEXT N_( \
+ "Specify if you want to attempt to fetch files'"\
+ "meta informations using the network." );
+
#define ALBUM_ART_TEXT N_( "Album art policy" )
#define ALBUM_ART_LONGTEXT N_( \
"Choose how album art will be downloaded." );
set_subcategory( SUBCAT_AUDIO_AOUT );
add_module( "aout", "audio output", NULL, NULL, AOUT_TEXT, AOUT_LONGTEXT,
VLC_TRUE );
+ change_short('A');
set_subcategory( SUBCAT_AUDIO_AFILTER );
add_module_list_cat( "audio-filter", SUBCAT_AUDIO_AFILTER, 0,
NULL, AUDIO_FILTER_TEXT,
SNAP_PREVIEW_LONGTEXT, VLC_FALSE );
add_bool( "snapshot-sequential", VLC_FALSE, NULL, SNAP_SEQUENTIAL_TEXT,
SNAP_SEQUENTIAL_LONGTEXT, VLC_FALSE );
+ add_integer( "snapshot-width", 320, NULL, SNAP_WIDTH_TEXT,
+ SNAP_WIDTH_LONGTEXT, VLC_TRUE );
+ add_integer( "snapshot-height", 200, NULL, SNAP_HEIGHT_TEXT,
+ SNAP_HEIGHT_LONGTEXT, VLC_TRUE );
set_section( N_("Window properties" ), NULL );
add_integer( "width", -1, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, VLC_TRUE );
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 );
set_section( N_( "Default devices") , NULL );
- add_file( "dvd", NULL, NULL, DVD_DEV_TEXT, DVD_DEV_LONGTEXT,
+ add_file( "dvd", DVD_DEVICE, 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_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 );
SOUT_VIDEO_LONGTEXT, VLC_TRUE );
add_bool( "sout-spu", 1, NULL, SOUT_SPU_TEXT,
SOUT_SPU_LONGTEXT, VLC_TRUE );
+ add_integer( "sout-mux-caching", 1500, NULL, SOUT_MUX_CACHING_TEXT,
+ SOUT_MUX_CACHING_LONGTEXT, VLC_TRUE );
set_section( N_("VLM"), NULL );
add_string( "vlm-conf", NULL, NULL, VLM_CONF_TEXT,
add_category_hint( N_("Miscellaneous"), MISC_CAT_LONGTEXT, VLC_TRUE );
add_module( "memcpy", "memcpy", NULL, NULL, MEMCPY_TEXT,
MEMCPY_LONGTEXT, VLC_TRUE );
- change_short('A');
change_need_restart();
set_section( N_("Plugins" ), NULL );
ONEINSTANCE_DBUS_LONGTEXT, VLC_TRUE );
add_bool( "playlist-enqueue", 0, NULL, PLAYLISTENQUEUE_TEXT,
PLAYLISTENQUEUE_LONGTEXT, VLC_TRUE );
+ change_unsaveable();
+
+ add_bool( "inhibit", 1, NULL, INHIBIT_TEXT,
+ INHIBIT_LONGTEXT, VLC_TRUE );
#endif
#if defined(WIN32)
ONEINSTANCEWHENSTARTEDFROMFILE_LONGTEXT, VLC_TRUE );
add_bool( "playlist-enqueue", 0, NULL, PLAYLISTENQUEUE_TEXT,
PLAYLISTENQUEUE_LONGTEXT, VLC_TRUE );
+ change_unsaveable();
add_bool( "high-priority", 0, NULL, HPRIORITY_TEXT,
HPRIORITY_LONGTEXT, VLC_FALSE );
change_need_restart();
add_bool( "auto-preparse", VLC_TRUE, NULL, PREPARSE_TEXT,
PREPARSE_LONGTEXT, VLC_FALSE );
- add_integer( "album-art", ALBUM_ART_WHEN_PLAYED, NULL, ALBUM_ART_TEXT,
+ add_integer( "fetch-meta", VLC_TRUE, NULL, FETCH_META_TEXT,
+ FETCH_META_LONGTEXT, VLC_FALSE );
+
+ add_integer( "album-art", ALBUM_ART_WHEN_ASKED, NULL, ALBUM_ART_TEXT,
ALBUM_ART_LONGTEXT, VLC_FALSE );
change_integer_list( pi_albumart_values,
ppsz_albumart_descriptions, 0 );
change_need_restart();
#endif
- add_bool( "color", 0, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE );
+ add_bool( "color", VLC_TRUE, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE );
add_bool( "advanced", 0, NULL, ADVANCED_TEXT, ADVANCED_LONGTEXT,
VLC_FALSE );
change_need_restart();
# 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
+# define KEY_MENU_RIGHT KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|KEY_RIGHT
+# define KEY_MENU_LEFT KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|KEY_LEFT
+# define KEY_MENU_UP KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|KEY_UP
+# define KEY_MENU_DOWN KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|KEY_DOWN
+# define KEY_MENU_SELECT KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|KEY_ENTER
#else
# define KEY_TOGGLE_FULLSCREEN 'f'
# 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
+# define KEY_MENU_RIGHT KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|KEY_RIGHT
+# define KEY_MENU_LEFT KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|KEY_LEFT
+# define KEY_MENU_UP KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|KEY_UP
+# define KEY_MENU_DOWN KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|KEY_DOWN
+# define KEY_MENU_SELECT KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|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,
projects / vlc / blobdiff