X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc-module.c;h=464239cb0cf535f41989bd15d89fbf04030f07e1;hb=675111cc7bbf4d6839761f1050b1518ed877d97b;hp=0089d725e75d2f08fd0663599a34d5e29158a703;hpb=e0b32b4cb3f6d9f391cbfe4bb06f42741073c845;p=vlc diff --git a/src/libvlc-module.c b/src/libvlc-module.c index 0089d725e7..464239cb0c 100644 --- a/src/libvlc-module.c +++ b/src/libvlc-module.c @@ -1067,16 +1067,16 @@ static const char *const ppsz_clock_descriptions[] = #define SYSLOG_LONGTEXT N_( \ "Log all VLC messages to syslog (UNIX systems)." ) -#define ONEINSTANCE_WIN_TEXT N_("Allow only one running instance") -#define ONEINSTANCE_WIN_LONGTEXT N_( \ +#define ONEINSTANCE_TEXT N_("Allow only one running instance") +#if defined( WIN32 ) +#define ONEINSTANCE_LONGTEXT N_( \ "Allowing only one running instance of VLC can sometimes be useful, " \ "for example if you associated VLC with some media types and you " \ "don't want a new instance of VLC to be opened each time you " \ "double-click on a file in the explorer. This option will allow you " \ "to play the file with the already running instance or enqueue it.") - -#define ONEINSTANCE_DBUS_TEXT ONEINSTANCE_WIN_TEXT -#define ONEINSTANCE_DBUS_LONGTEXT N_( \ +#elif defined( HAVE_DBUS ) +#define ONEINSTANCE_LONGTEXT N_( \ "Allowing only one running instance of VLC can sometimes be useful, " \ "for example if you associated VLC with some media types and you " \ "don't want a new instance of VLC to be opened each time you " \ @@ -1084,6 +1084,7 @@ static const char *const ppsz_clock_descriptions[] = "to play the file with the already running instance or enqueue it. " \ "This option requires the D-Bus session daemon to be active " \ "and the running instance of VLC to use D-Bus control interface.") +#endif #define STARTEDFROMFILE_TEXT N_("VLC is started from file association") #define STARTEDFROMFILE_LONGTEXT N_( \ @@ -1832,8 +1833,7 @@ vlc_module_begin(); PACKETIZER_TEXT, PACKETIZER_LONGTEXT, true ); set_subcategory( SUBCAT_SOUT_SAP ); - add_bool( "sap-flow-control", false, NULL, ANN_SAPCTRL_TEXT, - ANN_SAPCTRL_LONGTEXT, true ); + add_obsolete_bool( "sap-flow-control" ); add_integer( "sap-interval", 5, NULL, ANN_SAPINTV_TEXT, ANN_SAPINTV_LONGTEXT, true ); @@ -1903,18 +1903,13 @@ vlc_module_begin(); #endif #if defined(HAVE_DBUS) - add_bool( "one-instance", 0, NULL, ONEINSTANCE_DBUS_TEXT, - ONEINSTANCE_DBUS_LONGTEXT, true ); - add_bool( "playlist-enqueue", 0, NULL, PLAYLISTENQUEUE_TEXT, - PLAYLISTENQUEUE_LONGTEXT, true ); - add_bool( "inhibit", 1, NULL, INHIBIT_TEXT, INHIBIT_LONGTEXT, true ); #endif -#if defined(WIN32) - add_bool( "one-instance", 0, NULL, ONEINSTANCE_WIN_TEXT, - ONEINSTANCE_WIN_LONGTEXT, true ); +#if defined(WIN32) || defined(HAVE_DBUS) + add_bool( "one-instance", 0, NULL, ONEINSTANCE_TEXT, + ONEINSTANCE_LONGTEXT, true ); add_bool( "started-from-file", 0, NULL, STARTEDFROMFILE_TEXT, STARTEDFROMFILE_LONGTEXT, true ); change_internal(); @@ -1925,6 +1920,9 @@ vlc_module_begin(); add_bool( "playlist-enqueue", 0, NULL, PLAYLISTENQUEUE_TEXT, PLAYLISTENQUEUE_LONGTEXT, true ); change_unsaveable(); +#endif + +#if defined(WIN32) add_bool( "high-priority", 0, NULL, HPRIORITY_TEXT, HPRIORITY_LONGTEXT, false ); change_need_restart(); @@ -2131,7 +2129,7 @@ vlc_module_begin(); # 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_QUARTER KEY_UNSET # define KEY_ZOOM_HALF KEY_UNSET # define KEY_ZOOM_ORIGINAL KEY_UNSET # define KEY_ZOOM_DOUBLE KEY_UNSET @@ -2170,7 +2168,14 @@ vlc_module_begin(); # 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 +#else /* Non Mac OS X */ + /* + You should try to avoid Ctrl + letter key, because they are usually for + dialogs showing and interface related stuffs. + It would be nice (less important than previous rule) to try to avoid + alt + letter key, because they are usually for menu accelerators and you + don't know how the translator is going to do it. + */ # define KEY_TOGGLE_FULLSCREEN 'f' # define KEY_LEAVE_FULLSCREEN KEY_ESC # define KEY_PLAY_PAUSE KEY_SPACE @@ -2213,30 +2218,41 @@ vlc_module_begin(); # define KEY_DEINTERLACE 'd' # define KEY_INTF_SHOW 'i' # define KEY_INTF_HIDE KEY_MODIFIER_SHIFT|'i' -# define KEY_DISC_MENU KEY_MODIFIER_ALT|'r' -# define KEY_TITLE_PREV KEY_MODIFIER_ALT|'o' -# define KEY_TITLE_NEXT KEY_MODIFIER_ALT|'b' -# define KEY_CHAPTER_PREV KEY_MODIFIER_ALT|'p' -# define KEY_CHAPTER_NEXT KEY_MODIFIER_ALT|'n' -# define KEY_SNAPSHOT KEY_MODIFIER_CTRL|KEY_MODIFIER_ALT|'s' +# define KEY_DISC_MENU KEY_MODIFIER_SHIFT|'m' +# define KEY_TITLE_PREV KEY_MODIFIER_SHIFT|'o' +# define KEY_TITLE_NEXT KEY_MODIFIER_SHIFT|'b' +# define KEY_CHAPTER_PREV KEY_MODIFIER_SHIFT|'p' +# define KEY_CHAPTER_NEXT KEY_MODIFIER_SHIFT|'n' +# define KEY_SNAPSHOT KEY_MODIFIER_SHIFT|'s' # define KEY_ZOOM 'z' # define KEY_UNZOOM KEY_MODIFIER_SHIFT|'z' -# define KEY_CROP_TOP KEY_MODIFIER_ALT|'i' -# define KEY_UNCROP_TOP KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'i' -# define KEY_CROP_LEFT KEY_MODIFIER_ALT|'j' -# define KEY_UNCROP_LEFT KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'j' -# define KEY_CROP_BOTTOM KEY_MODIFIER_ALT|'k' -# define KEY_UNCROP_BOTTOM KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'k' -# define KEY_CROP_RIGHT KEY_MODIFIER_ALT|'l' -# define KEY_UNCROP_RIGHT KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'l' +# define KEY_AUDIODEVICE_CYCLE KEY_MODIFIER_SHIFT|'a' + +# define KEY_HISTORY_BACK KEY_MODIFIER_SHIFT|'g' +# define KEY_HISTORY_FORWARD KEY_MODIFIER_SHIFT|'h' +# define KEY_RECORD KEY_MODIFIER_SHIFT|'r' +# define KEY_DUMP KEY_MODIFIER_SHIFT|'d' +# define KEY_WALLPAPER 'w' +/* Cropping */ +# define KEY_CROP_TOP KEY_MODIFIER_ALT|'r' +# define KEY_UNCROP_TOP KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'r' +# define KEY_CROP_LEFT KEY_MODIFIER_ALT|'d' +# define KEY_UNCROP_LEFT KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'d' +# define KEY_CROP_BOTTOM KEY_MODIFIER_ALT|'c' +# define KEY_UNCROP_BOTTOM KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'c' +# define KEY_CROP_RIGHT KEY_MODIFIER_ALT|'f' +# define KEY_UNCROP_RIGHT KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'f' + +/* Zooming */ # 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' +/* Bookmarks */ # 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 @@ -2257,20 +2273,15 @@ vlc_module_begin(); # define KEY_PLAY_BOOKMARK8 KEY_F8 # define KEY_PLAY_BOOKMARK9 KEY_F9 # define KEY_PLAY_BOOKMARK10 KEY_F10 -# define KEY_HISTORY_BACK KEY_MODIFIER_ALT|'g' -# define KEY_HISTORY_FORWARD KEY_MODIFIER_ALT|'h' -# define KEY_RECORD KEY_MODIFIER_CTRL|KEY_MODIFIER_SHIFT|'r' -# define KEY_DUMP KEY_MODIFIER_CTRL|KEY_MODIFIER_SHIFT|'d' -# define KEY_WALLPAPER 'w' -# define KEY_MENU_ON KEY_MODIFIER_ALT|'m' -# define KEY_MENU_OFF KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'m' +/* OSD menu */ +# define KEY_MENU_ON KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'m' +# define KEY_MENU_OFF KEY_MODIFIER_ALT|KEY_MODIFIER_CTRL|'m' # 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 -# define KEY_AUDIODEVICE_CYCLE KEY_MODIFIER_ALT|'a' #endif add_key( "key-toggle-fullscreen", KEY_TOGGLE_FULLSCREEN, NULL, TOGGLE_FULLSCREEN_KEY_TEXT, @@ -2419,15 +2430,15 @@ vlc_module_begin(); LOOP_KEY_TEXT, LOOP_KEY_LONGTEXT, false ); set_section ( N_("Zoom" ), NULL ); - add_key( "key-zoom-quarter", KEY_ZOOM_QUARTER, NULL, + add_key( "key-zoom-quarter", KEY_ZOOM_QUARTER, NULL, ZOOM_QUARTER_KEY_TEXT, NULL, false ); - add_key( "key-zoom-half", KEY_ZOOM_HALF, NULL, + add_key( "key-zoom-half", KEY_ZOOM_HALF, NULL, ZOOM_HALF_KEY_TEXT, NULL, false ); - add_key( "key-zoom-original", KEY_ZOOM_ORIGINAL, NULL, + add_key( "key-zoom-original", KEY_ZOOM_ORIGINAL, NULL, ZOOM_ORIGINAL_KEY_TEXT, NULL, false ); - add_key( "key-zoom-double", KEY_ZOOM_DOUBLE, NULL, + add_key( "key-zoom-double", KEY_ZOOM_DOUBLE, NULL, ZOOM_DOUBLE_KEY_TEXT, NULL, false ); - + set_section ( N_("Jump sizes" ), NULL ); add_integer( "extrashort-jump-size", 3, NULL, JIEXTRASHORT_TEXT, JIEXTRASHORT_LONGTEXT, false ); @@ -2534,7 +2545,7 @@ vlc_module_begin(); N_("resets the current plugins cache") #define VERSION_TEXT \ N_("print version information") - + add_bool( "help", false, NULL, HELP_TEXT, "", false ); change_short( 'h' ); change_internal(); @@ -2556,7 +2567,6 @@ vlc_module_begin(); change_unsaveable(); add_bool( "list-verbose", false, NULL, LIST_VERBOSE_TEXT, "", false ); - change_short( 'l' ); change_internal(); change_unsaveable(); add_string( "module", NULL, NULL, MODULE_TEXT, "", false );