X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc-module.c;h=e01b822131118f748df7298ed1463208ac06683b;hb=b3a086f551ef547194d32ac4ae4911a16885f3c6;hp=a372d4a2100b0bddafe74b880aac6115b641e828;hpb=7fd77d963a10bba8397593a48a23b970665a9d91;p=vlc diff --git a/src/libvlc-module.c b/src/libvlc-module.c index a372d4a210..e01b822131 100644 --- a/src/libvlc-module.c +++ b/src/libvlc-module.c @@ -521,10 +521,6 @@ static const char *ppsz_pos_descriptions[] = "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 " \ @@ -981,14 +977,6 @@ static const char *ppsz_clock_descriptions[] = #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.") @@ -1236,6 +1224,12 @@ static const char *ppsz_pltree_descriptions[] = { N_("Default"), N_("Always"), N #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") @@ -1382,10 +1376,10 @@ const char vlc_usage[] = N_( "\n [dvd://][device][@raw_device] DVD device" "\n [vcd://][device] VCD device" "\n [cdda://][device] Audio CD device" - "\n udp:[[]@[][:]]" + "\n udp://[[]@[][:]]" "\n UDP stream sent by a streaming server" - "\n vlc:pause: Special item to pause the playlist for a certain time" - "\n vlc:quit Special item to quit VLC" + "\n vlc://pause: Special item to pause the playlist for a certain time" + "\n vlc://quit Special item to quit VLC" "\n"); /* @@ -1467,6 +1461,9 @@ vlc_module_begin(); 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 */ @@ -1583,8 +1580,6 @@ vlc_module_begin(); 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 ); @@ -1806,13 +1801,6 @@ vlc_module_begin(); MINIMIZE_THREADS_LONGTEXT, VLC_TRUE ); change_need_restart(); - 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 ); @@ -1830,7 +1818,6 @@ vlc_module_begin(); 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 ); @@ -2048,6 +2035,12 @@ vlc_module_begin(); # 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 @@ -2144,6 +2137,11 @@ vlc_module_begin(); # 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 @@ -2322,6 +2320,16 @@ vlc_module_begin(); 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 ); @@ -2542,6 +2550,10 @@ const struct hotkey libvlc_hotkeys[] = { "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 },