#define __BUILTIN__
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include "libvlc.h"
"subsystem, such as the DVD or VCD device, the network interface " \
"settings or the subtitle channel.")
-#define FRANCE_LONGTEXT N_( \
- "If you live in France, it is not allowed to workaround any Digital " \
- "Restrictions Management measure." )
-
#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 MINIMIZE_THREADS_LONGTEXT N_( \
"This option minimizes the number of threads needed to run VLC.")
+#define SECURITY_POLICY_TEXT N_("Policy for handling unsafe options.")
+#define SECURITY_POLICY_LONGTEXT N_( \
+ "This option dictates the default policy when processing options " \
+ "which may be harmful when used in a malicious way.")
+
+static int pi_secpolicy_values[] = { 0, 1, 2 };
+static const char *ppsz_secpolicy_descriptions[] = { N_("Block"), N_("Allow"), N_("Prompt") };
+
#define PLUGIN_PATH_TEXT N_("Modules search path")
#define PLUGIN_PATH_LONGTEXT N_( \
"Additional path for VLC to look for its modules.")
#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 ZOOM_QUARTER_KEY_TEXT N_("1:4 Quarter")
+#define ZOOM_HALF_KEY_TEXT N_("1:2 Half")
+#define ZOOM_ORIGINAL_KEY_TEXT N_("1:1 Original")
+#define ZOOM_DOUBLE_KEY_TEXT N_("2:1 Double")
+
#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")
"\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://[[<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 vlc://pause:<seconds> Special item to pause the playlist for a certain time"
+ "\n vlc://quit Special item to quit VLC"
"\n");
/*
change_short('f');
add_bool( "embedded-video", 1, NULL, EMBEDDED_TEXT, EMBEDDED_LONGTEXT,
VLC_TRUE );
+#ifdef __APPLE__
+ add_deprecated_alias( "macosx-embedded" ); /*deprecated since 0.9.0 */
+#endif
add_bool( "drop-late-frames", 1, NULL, DROP_LATE_FRAMES_TEXT,
DROP_LATE_FRAMES_LONGTEXT, VLC_TRUE );
/* Used in vout_synchro */
set_section( N_("Snapshot") , NULL );
add_directory( "snapshot-path", NULL, NULL, SNAP_PATH_TEXT,
SNAP_PATH_LONGTEXT, VLC_FALSE );
+ change_unsafe();
add_string( "snapshot-prefix", "vlcsnap-", NULL, SNAP_PREFIX_TEXT,
SNAP_PREFIX_LONGTEXT, VLC_FALSE );
add_string( "snapshot-format", "png", NULL, SNAP_FORMAT_TEXT,
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_GENERAL );
- add_bool( "france", VLC_FALSE, NULL, N_("France"), FRANCE_LONGTEXT, VLC_TRUE );
-
set_section( N_( "Track settings" ), NULL );
add_integer( "program", 0, NULL,
INPUT_PROGRAM_TEXT, INPUT_PROGRAM_LONGTEXT, VLC_TRUE );
add_directory( "plugin-path", NULL, NULL, PLUGIN_PATH_TEXT,
PLUGIN_PATH_LONGTEXT, VLC_TRUE );
change_need_restart();
+ change_unsafe();
set_section( N_("Performance options"), NULL );
add_bool( "minimize-threads", 0, NULL, MINIMIZE_THREADS_TEXT,
MINIMIZE_THREADS_LONGTEXT, VLC_TRUE );
change_need_restart();
-#if !defined(__APPLE__) && !defined(SYS_BEOS) && defined(PTHREAD_COND_T_IN_PTHREAD_H)
+ set_section( N_("Security options"), NULL );
+ add_integer( "security-policy", 2, NULL, SECURITY_POLICY_TEXT,
+ SECURITY_POLICY_LONGTEXT, VLC_TRUE );
+ change_integer_list( pi_secpolicy_values, ppsz_secpolicy_descriptions, 0 );
+ change_unsafe();
+ change_need_restart();
+
+#if !defined(__APPLE__) && !defined(SYS_BEOS) && defined(LIBVLC_USE_PTHREAD)
add_bool( "rt-priority", VLC_FALSE, NULL, RT_PRIORITY_TEXT,
RT_PRIORITY_LONGTEXT, VLC_TRUE );
change_need_restart();
#endif
-#if !defined(SYS_BEOS) && defined(PTHREAD_COND_T_IN_PTHREAD_H)
+#if !defined(SYS_BEOS) && defined(LIBVLC_USE_PTHREAD)
add_integer( "rt-offset", 0, NULL, RT_OFFSET_TEXT,
RT_OFFSET_LONGTEXT, VLC_TRUE );
change_need_restart();
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
add_bool( "color", VLC_TRUE, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE );
- add_bool( "advanced", 0, NULL, ADVANCED_TEXT, ADVANCED_LONGTEXT,
+ add_bool( "advanced", VLC_FALSE, NULL, ADVANCED_TEXT, ADVANCED_LONGTEXT,
VLC_FALSE );
change_need_restart();
add_bool( "interact", VLC_TRUE, NULL, INTERACTION_TEXT,
# define KEY_CROP_RIGHT KEY_MODIFIER_ALT|'l'
# define KEY_UNCROP_RIGHT KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'l'
+/* the macosx-interface already has bindings */
+# define KEY_ZOOM_QUARTER KEY_UNSET
+# define KEY_ZOOM_HALF KEY_UNSET
+# define KEY_ZOOM_ORIGINAL KEY_UNSET
+# define KEY_ZOOM_DOUBLE KEY_UNSET
+
# define KEY_SET_BOOKMARK1 KEY_MODIFIER_COMMAND|KEY_F1
# define KEY_SET_BOOKMARK2 KEY_MODIFIER_COMMAND|KEY_F2
# define KEY_SET_BOOKMARK3 KEY_MODIFIER_COMMAND|KEY_F3
# define KEY_CROP_RIGHT KEY_MODIFIER_ALT|'l'
# define KEY_UNCROP_RIGHT KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'l'
+# define KEY_ZOOM_QUARTER KEY_MODIFIER_CTRL|'1'
+# define KEY_ZOOM_HALF KEY_MODIFIER_CTRL|'2'
+# define KEY_ZOOM_ORIGINAL KEY_MODIFIER_CTRL|'3'
+# define KEY_ZOOM_DOUBLE KEY_MODIFIER_CTRL|'4'
+
# define KEY_SET_BOOKMARK1 KEY_MODIFIER_CTRL|KEY_F1
# define KEY_SET_BOOKMARK2 KEY_MODIFIER_CTRL|KEY_F2
# define KEY_SET_BOOKMARK3 KEY_MODIFIER_CTRL|KEY_F3
add_key( "key-loop", KEY_LOOP, NULL,
LOOP_KEY_TEXT, LOOP_KEY_LONGTEXT, VLC_FALSE );
+ set_section ( N_("Zoom" ), NULL );
+ add_key( "key-zoom-quarter", KEY_ZOOM_QUARTER, NULL,
+ ZOOM_QUARTER_KEY_TEXT, NULL, VLC_FALSE );
+ add_key( "key-zoom-half", KEY_ZOOM_HALF, NULL,
+ ZOOM_HALF_KEY_TEXT, NULL, VLC_FALSE );
+ add_key( "key-zoom-original", KEY_ZOOM_ORIGINAL, NULL,
+ ZOOM_ORIGINAL_KEY_TEXT, NULL, VLC_FALSE );
+ add_key( "key-zoom-double", KEY_ZOOM_DOUBLE, NULL,
+ ZOOM_DOUBLE_KEY_TEXT, NULL, VLC_FALSE );
+
set_section ( N_("Jump sizes" ), NULL );
add_integer( "extrashort-jump-size", 3, NULL, JIEXTRASHORT_TEXT,
JIEXTRASHORT_LONGTEXT, VLC_FALSE );
#define LONGHELP_TEXT \
N_("print help for VLC and all its modules (can be combined with " \
"--advanced and --help-verbose)")
-#define ADVANCED_TEXT \
- N_("print help for the advanced options")
#define HELP_VERBOSE_TEXT \
N_("ask for extra verbosity when displaying help")
#define LIST_TEXT \
change_short( 'H' );
change_internal();
change_unsaveable();
- add_bool( "advanced", VLC_FALSE, NULL, ADVANCED_TEXT, "", VLC_FALSE );
- change_internal();
- change_unsaveable();
add_bool( "help-verbose", VLC_FALSE, NULL, HELP_VERBOSE_TEXT, "",
VLC_FALSE );
change_internal();
{ "key-title-next", ACTIONID_TITLE_NEXT, 0, 0, 0, 0 },
{ "key-chapter-prev", ACTIONID_CHAPTER_PREV, 0, 0, 0, 0 },
{ "key-chapter-next", ACTIONID_CHAPTER_NEXT, 0, 0, 0, 0 },
+ { "key-zoom-quarter", ACTIONID_ZOOM_QUARTER, 0, 0, 0, 0 },
+ { "key-zoom-half", ACTIONID_ZOOM_HALF, 0, 0, 0, 0 },
+ { "key-zoom-original", ACTIONID_ZOOM_ORIGINAL, 0, 0, 0, 0 },
+ { "key-zoom-double", ACTIONID_ZOOM_DOUBLE, 0, 0, 0, 0 },
{ "key-set-bookmark1", ACTIONID_SET_BOOKMARK1, 0, 0, 0, 0 },
{ "key-set-bookmark2", ACTIONID_SET_BOOKMARK2, 0, 0, 0, 0 },
{ "key-set-bookmark3", ACTIONID_SET_BOOKMARK3, 0, 0, 0, 0 },
projects / vlc / blobdiff