X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc-module.c;h=cdf42aaaed13cfded76dfdc90444bab78c0ec072;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=92c05799941c2596d846c290b0922b498314c2e1;hpb=263c385cdbdb7b8ddaa7e4b07634252a142c1ada;p=vlc diff --git a/src/libvlc-module.c b/src/libvlc-module.c index 92c0579994..cdf42aaaed 100644 --- a/src/libvlc-module.c +++ b/src/libvlc-module.c @@ -39,18 +39,18 @@ #if defined (WIN32) || defined (__APPLE__) static const char *ppsz_language[] = -{ "auto", "en", "en_GB", "ca", "cs", "da", "de", "es", "fa" "fr", "gl", "he", - "hu", "it", "ja", "ka", "ko", "ms", "nl", "oc", "pt_BR", "ro", "ru", "sk", - "sl", "sv", "tr", "zh_CN", "zh_TW" }; +{ "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" }; static const char *ppsz_language_text[] = -{ N_("Auto"), N_("American English"), N_("British English"), +{ 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_("Brazilian Portuguese"), N_("Romanian"), -N_("Russian"), N_("Slovak"), N_("Slovenian"), N_("Swedish"), N_("Turkish"), -N_("Simplified Chinese"), N_("Chinese Traditional") }; +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") }; #endif static const char *ppsz_snap_formats[] = @@ -220,6 +220,28 @@ static const char *ppsz_force_dolby_descriptions[] = { N_("Auto"), N_("On"), N_( #define AUDIO_VISUAL_LONGTEXT N_( \ "This adds visualization modules (spectrum analyzer, etc.).") + +#define AUDIO_REPLAY_GAIN_MODE_TEXT N_( \ + "Replay gain mode" ) +#define AUDIO_REPLAY_GAIN_MODE_LONGTEXT N_( \ + "Select the replay gain mode" ) +#define AUDIO_REPLAY_GAIN_PREAMP_TEXT N_( \ + "Replay preamp" ) +#define AUDIO_REPLAY_GAIN_PREAMP_LONGTEXT N_( \ + "This allows you to change the default target level (89 dB) " \ + "for stream with replay gain information" ) +#define AUDIO_REPLAY_GAIN_DEFAULT_TEXT N_( \ + "Default replay gain" ) +#define AUDIO_REPLAY_GAIN_DEFAULT_LONGTEXT N_( \ + "This is the gain used for stream without replay gain information" ) +#define AUDIO_REPLAY_GAIN_PEAK_PROTECTION_TEXT N_( \ + "Peak protection" ) +#define AUDIO_REPLAY_GAIN_PEAK_PROTECTION_LONGTEXT N_( \ + "Protect against sound clipping" ) + +static const char *ppsz_replay_gain_mode[] = { "none", "track", "album" }; +static const char *ppsz_replay_gain_mode_text[] = { N_("None"), N_("Track"), N_("Album") }; + /***************************************************************************** * Video ****************************************************************************/ @@ -303,6 +325,23 @@ static const char *ppsz_align_descriptions[] = #define VIDEO_ON_TOP_LONGTEXT N_( \ "Always place the video window on top of other windows." ) +#define VIDEO_TITLE_SHOW_TEXT N_("Show media title on video.") +#define VIDEO_TITLE_SHOW_LONGTEXT N_( \ + "Display the title of the video on top of the movie.") + +#define VIDEO_TITLE_TIMEOUT_TEXT N_("Show video title for x miliseconds.") +#define VIDEO_TITLE_TIMEOUT_LONGTEXT N_( \ + "Show the video title for n miliseconds, default is 5000 ms (5 sec.)") + +#define VIDEO_TITLE_POSITION_TEXT N_("Position of video title.") +#define VIDEO_TITLE_POSITION_LONGTEXT N_( \ + "Place on video where to display the title (default bottom center).") + +static int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 }; +static const char *ppsz_pos_descriptions[] = +{ N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"), + N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") }; + #define SS_TEXT N_("Disable screensaver") #define SS_LONGTEXT N_("Disable the screensaver during video playback." ) @@ -436,8 +475,10 @@ static const char *ppsz_clock_descriptions[] = #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_( \ @@ -514,6 +555,10 @@ static const char *ppsz_clock_descriptions[] = #define STOP_TIME_LONGTEXT N_( \ "The stream will stop at this position (in seconds)." ) +#define RUN_TIME_TEXT N_("Run time") +#define RUN_TIME_LONGTEXT N_( \ + "The stream will run this duration (in seconds)." ) + #define INPUT_LIST_TEXT N_("Input list") #define INPUT_LIST_LONGTEXT N_( \ "You can give a comma-separated list " \ @@ -923,24 +968,6 @@ static const char *ppsz_clock_descriptions[] = "all the processor time and render the whole system unresponsive which " \ "might require a reboot of your machine.") -#define FAST_MUTEX_TEXT N_("Fast mutex on NT/2K/XP (developers only)") -#define FAST_MUTEX_LONGTEXT N_( \ - "On Windows NT/2K/XP we use a slow mutex implementation but which " \ - "allows us to correctly implement condition variables. " \ - "You can also use the faster Win9x implementation but you might " \ - "experience problems with it.") - -#define WIN9X_CV_TEXT N_("Condition variables implementation for Win9x " \ - "(developers only)") -#define WIN9X_CV_LONGTEXT N_( \ - "On Windows 9x/Me you can use a fast but incorrect condition variables " \ - "implementation (more precisely there is a possibility for a race " \ - "condition to happen). " \ - "However it is possible to use slower alternatives which are more " \ - "robust. " \ - "Currently you can choose between implementation 0 (which is the " \ - "fastest but slightly incorrect), 1 (default) and 2.") - #define PLAYLISTENQUEUE_TEXT N_( \ "Enqueue items to playlist when in one instance mode") #define PLAYLISTENQUEUE_LONGTEXT N_( \ @@ -1021,8 +1048,10 @@ static const char *ppsz_pltree_descriptions[] = { N_("Default"), N_("Always"), N #define HOTKEY_CAT_LONGTEXT N_( "These settings are the global VLC key " \ "bindings, known as \"hotkeys\"." ) -#define FULLSCREEN_KEY_TEXT N_("Fullscreen") -#define FULLSCREEN_KEY_LONGTEXT N_("Select the hotkey to use to swap fullscreen state.") +#define TOGGLE_FULLSCREEN_KEY_TEXT N_("Fullscreen") +#define TOGGLE_FULLSCREEN_KEY_LONGTEXT N_("Select the hotkey to use to swap fullscreen state.") +#define LEAVE_FULLSCREEN_KEY_TEXT N_("Leave fullscreen") +#define LEAVE_FULLSCREEN_KEY_LONGTEXT N_("Select the hotkey to use to leave fullscreen state.") #define PLAY_PAUSE_KEY_TEXT N_("Play/Pause") #define PLAY_PAUSE_KEY_LONGTEXT N_("Select the hotkey to use to swap paused state.") #define PAUSE_KEY_TEXT N_("Pause only") @@ -1208,6 +1237,30 @@ static const char *ppsz_pltree_descriptions[] = { N_("Default"), N_("Always"), N #define UNCROP_RIGHT_KEY_TEXT N_("Uncrop one pixel from the right of the video") #define UNCROP_RIGHT_KEY_LONGTEXT N_("Uncrop one pixel from the right of the video") +#define WALLPAPER_KEY_TEXT N_("Toggle wallpaper mode in video output") +#define WALLPAPER_KEY_LONGTEXT N_( \ + "Toggle wallpaper mode in video output. Only works with the directx " \ + "video output for the time being." ) + +#define MENU_ON_KEY_TEXT N_("Display OSD menu on top of video output") +#define MENU_ON_KEY_LONGTEXT N_("Display OSDmenu on top of video output") +#define MENU_OFF_KEY_TEXT N_("Do not display OSD menu on video output") +#define MENU_OFF_KEY_LONGTEXT N_("Do not display OSDmenu on top of video output") +#define MENU_RIGHT_KEY_TEXT N_("Highlight widget on the right") +#define MENU_RIGHT_KEY_LONGTEXT N_( \ + "Move OSD menu highlight to the widget on the right") +#define MENU_LEFT_KEY_TEXT N_("Highlight widget on the left") +#define MENU_LEFT_KEY_LONGTEXT N_( \ + "Move OSD menu highlight to the widget on the left") +#define MENU_UP_KEY_TEXT N_("Highlight widget on top") +#define MENU_UP_KEY_LONGTEXT N_( \ + "Move OSD menu highlight to the widget on top") +#define MENU_DOWN_KEY_TEXT N_("Highlight widget below") +#define MENU_DOWN_KEY_LONGTEXT N_( \ + "Move OSD menu highlight to the widget below") +#define MENU_SELECT_KEY_TEXT N_("Select current widget") +#define MENU_SELECT_KEY_LONGTEXT N_( \ + "Selecting current widget performs the associated action.") const char vlc_usage[] = N_( "Usage: %s [options] [stream] ..." @@ -1283,6 +1336,18 @@ vlc_module_begin(); change_integer_list( pi_force_dolby_values, ppsz_force_dolby_descriptions, 0 ); add_integer( "audio-desync", 0, NULL, DESYNC_TEXT, DESYNC_LONGTEXT, VLC_TRUE ); + + /* FIXME TODO create a subcat replay gain ? */ + add_string( "audio-replay-gain-mode", ppsz_replay_gain_mode[0], NULL, AUDIO_REPLAY_GAIN_MODE_TEXT, + AUDIO_REPLAY_GAIN_MODE_LONGTEXT, VLC_FALSE ); + change_string_list( ppsz_replay_gain_mode, ppsz_replay_gain_mode_text, 0 ); + add_float( "audio-replay-gain-preamp", 0.0, NULL, + AUDIO_REPLAY_GAIN_PREAMP_TEXT, AUDIO_REPLAY_GAIN_PREAMP_LONGTEXT, VLC_FALSE ); + add_float( "audio-replay-gain-default", -7.0, NULL, + AUDIO_REPLAY_GAIN_DEFAULT_TEXT, AUDIO_REPLAY_GAIN_DEFAULT_LONGTEXT, VLC_FALSE ); + add_bool( "audio-replay-gain-peak-protection", VLC_TRUE, NULL, + AUDIO_REPLAY_GAIN_PEAK_PROTECTION_TEXT, AUDIO_REPLAY_GAIN_PEAK_PROTECTION_LONGTEXT, VLC_TRUE ); + set_subcategory( SUBCAT_AUDIO_AOUT ); add_module( "aout", "audio output", NULL, NULL, AOUT_TEXT, AOUT_LONGTEXT, VLC_TRUE ); @@ -1322,6 +1387,14 @@ vlc_module_begin(); add_bool( "disable-screensaver", VLC_TRUE, NULL, SS_TEXT, SS_LONGTEXT, VLC_TRUE ); + add_bool( "video-title-show", 1, NULL, VIDEO_TITLE_SHOW_TEXT, + VIDEO_TITLE_SHOW_LONGTEXT, VLC_FALSE ); + add_integer( "video-title-timeout", 5000, NULL, VIDEO_TITLE_TIMEOUT_TEXT, + VIDEO_TITLE_TIMEOUT_LONGTEXT, VLC_FALSE ); + add_integer( "video-title-position", 8, NULL, VIDEO_TITLE_POSITION_TEXT, + VIDEO_TITLE_POSITION_LONGTEXT, VLC_FALSE ); + change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 ); + set_section( N_("Snapshot") , NULL ); add_directory( "snapshot-path", NULL, NULL, SNAP_PATH_TEXT, SNAP_PATH_LONGTEXT, VLC_FALSE ); @@ -1367,8 +1440,8 @@ vlc_module_begin(); 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 @@ -1401,7 +1474,7 @@ vlc_module_begin(); 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 ); @@ -1419,10 +1492,10 @@ vlc_module_begin(); 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 ); @@ -1441,6 +1514,8 @@ vlc_module_begin(); START_TIME_TEXT, START_TIME_LONGTEXT, VLC_TRUE ); add_integer( "stop-time", 0, NULL, STOP_TIME_TEXT, STOP_TIME_LONGTEXT, VLC_TRUE ); + add_integer( "run-time", 0, NULL, + RUN_TIME_TEXT, RUN_TIME_LONGTEXT, VLC_TRUE ); add_string( "input-list", NULL, NULL, INPUT_LIST_TEXT, INPUT_LIST_LONGTEXT, VLC_TRUE ); add_string( "input-slave", NULL, NULL, @@ -1462,7 +1537,7 @@ vlc_module_begin(); 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 ); @@ -1663,12 +1738,6 @@ vlc_module_begin(); add_bool( "high-priority", 0, NULL, HPRIORITY_TEXT, HPRIORITY_LONGTEXT, VLC_FALSE ); change_need_restart(); - add_bool( "fast-mutex", 0, NULL, FAST_MUTEX_TEXT, - FAST_MUTEX_LONGTEXT, VLC_TRUE ); - change_need_restart(); - add_integer( "win9x-cv-method", 1, NULL, WIN9X_CV_TEXT, - WIN9X_CV_LONGTEXT, VLC_TRUE ); - change_need_restart(); #endif /* Playlist options */ @@ -1744,7 +1813,7 @@ vlc_module_begin(); add_bool( "advanced", 0, NULL, ADVANCED_TEXT, ADVANCED_LONGTEXT, VLC_FALSE ); change_need_restart(); - add_bool( "interact", VLC_FALSE, NULL, INTERACTION_TEXT, + add_bool( "interact", VLC_TRUE, NULL, INTERACTION_TEXT, INTERACTION_LONGTEXT, VLC_FALSE ); add_bool( "show-intf", VLC_FALSE, NULL, SHOWINTF_TEXT, SHOWINTF_LONGTEXT, @@ -1803,7 +1872,8 @@ vlc_module_begin(); * show info KEY_MODIFIER_COMMAND|'i' * help KEY_MODIFIER_COMMAND|'?' */ -# define KEY_FULLSCREEN KEY_MODIFIER_COMMAND|'f' +# define KEY_TOGGLE_FULLSCREEN KEY_MODIFIER_COMMAND|'f' +# define KEY_LEAVE_FULLSCREEN KEY_ESC # define KEY_PLAY_PAUSE KEY_MODIFIER_COMMAND|'p' # define KEY_PAUSE KEY_UNSET # define KEY_PLAY KEY_UNSET @@ -1885,9 +1955,19 @@ vlc_module_begin(); # define KEY_HISTORY_FORWARD KEY_MODIFIER_COMMAND|']' # define KEY_RECORD KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'r' # define KEY_DUMP KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'d' +# define KEY_WALLPAPER KEY_MODIFIER_COMMAND|'w' + +# 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 #else -# define KEY_FULLSCREEN 'f' +# define KEY_TOGGLE_FULLSCREEN 'f' +# define KEY_LEAVE_FULLSCREEN KEY_ESC # define KEY_PLAY_PAUSE KEY_SPACE # define KEY_PAUSE KEY_UNSET # define KEY_PLAY KEY_UNSET @@ -1914,26 +1994,27 @@ vlc_module_begin(); # define KEY_VOL_UP KEY_MODIFIER_CTRL|KEY_UP # define KEY_VOL_DOWN KEY_MODIFIER_CTRL|KEY_DOWN # define KEY_VOL_MUTE 'm' -# define KEY_SUBDELAY_UP KEY_MODIFIER_CTRL|'h' -# define KEY_SUBDELAY_DOWN KEY_MODIFIER_CTRL|'j' -# define KEY_AUDIODELAY_UP KEY_MODIFIER_CTRL|'k' -# define KEY_AUDIODELAY_DOWN KEY_MODIFIER_CTRL|'l' +# define KEY_SUBDELAY_UP 'h' +# define KEY_SUBDELAY_DOWN 'g' +# define KEY_AUDIODELAY_UP 'k' +# define KEY_AUDIODELAY_DOWN 'j' # define KEY_RANDOM 'r' -# define KEY_LOOP KEY_MODIFIER_SHIFT|'l' +# define KEY_LOOP 'l' -# define KEY_AUDIO_TRACK 'l' -# define KEY_SUBTITLE_TRACK 'k' +# define KEY_AUDIO_TRACK 'b' +# define KEY_SUBTITLE_TRACK 'v' # define KEY_ASPECT_RATIO 'a' # define KEY_CROP 'c' # define KEY_DEINTERLACE 'd' # define KEY_INTF_SHOW 'i' # define KEY_INTF_HIDE 'I' -# define KEY_DISC_MENU KEY_MODIFIER_CTRL|'m' -# define KEY_TITLE_PREV KEY_MODIFIER_CTRL|'p' -# define KEY_TITLE_NEXT KEY_MODIFIER_CTRL|'f' -# define KEY_CHAPTER_PREV KEY_MODIFIER_CTRL|'u' -# define KEY_CHAPTER_NEXT KEY_MODIFIER_CTRL|'d' +# 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_ZOOM 'z' # define KEY_UNZOOM KEY_MODIFIER_SHIFT|'z' @@ -1966,14 +2047,26 @@ 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_CTRL|'v' -# define KEY_HISTORY_FORWARD KEY_MODIFIER_CTRL|'b' -# define KEY_RECORD KEY_MODIFIER_CTRL|'r' +# 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' +# 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 #endif - add_key( "key-fullscreen", KEY_FULLSCREEN, NULL, FULLSCREEN_KEY_TEXT, - FULLSCREEN_KEY_LONGTEXT, VLC_FALSE ); + add_key( "key-toggle-fullscreen", KEY_TOGGLE_FULLSCREEN, NULL, TOGGLE_FULLSCREEN_KEY_TEXT, + TOGGLE_FULLSCREEN_KEY_LONGTEXT, VLC_FALSE ); + 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, PLAY_PAUSE_KEY_LONGTEXT, VLC_FALSE ); add_key( "key-pause", KEY_PAUSE, NULL, PAUSE_KEY_TEXT, @@ -2073,6 +2166,23 @@ vlc_module_begin(); ZOOM_KEY_TEXT, ZOOM_KEY_LONGTEXT, VLC_TRUE ); add_key( "key-unzoom", KEY_UNZOOM, NULL, UNZOOM_KEY_TEXT, UNZOOM_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-wallpaper", KEY_WALLPAPER, NULL, WALLPAPER_KEY_TEXT, + WALLPAPER_KEY_LONGTEXT, VLC_FALSE ); + + add_key( "key-menu-on", KEY_MENU_ON, NULL, + MENU_ON_KEY_TEXT, MENU_ON_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-menu-off", KEY_MENU_OFF, NULL, + MENU_OFF_KEY_TEXT, MENU_OFF_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-menu-right", KEY_MENU_RIGHT, NULL, + MENU_RIGHT_KEY_TEXT, MENU_RIGHT_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-menu-left", KEY_MENU_LEFT, NULL, + MENU_LEFT_KEY_TEXT, MENU_LEFT_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-menu-up", KEY_MENU_UP, NULL, + MENU_UP_KEY_TEXT, MENU_UP_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-menu-down", KEY_MENU_DOWN, NULL, + MENU_DOWN_KEY_TEXT, MENU_DOWN_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-menu-select", KEY_MENU_SELECT, NULL, + MENU_SELECT_KEY_TEXT, MENU_SELECT_KEY_LONGTEXT, VLC_TRUE ); add_key( "key-crop-top", KEY_CROP_TOP, NULL, CROP_TOP_KEY_TEXT, CROP_TOP_KEY_LONGTEXT, VLC_TRUE ); @@ -2277,7 +2387,8 @@ const struct hotkey libvlc_hotkeys[] = { "key-next", ACTIONID_NEXT, 0, 0, 0, 0 }, { "key-faster", ACTIONID_FASTER, 0, 0, 0, 0 }, { "key-slower", ACTIONID_SLOWER, 0, 0, 0, 0 }, - { "key-fullscreen", ACTIONID_FULLSCREEN, 0, 0, 0, 0 }, + { "key-toggle-fullscreen", ACTIONID_TOGGLE_FULLSCREEN, 0, 0, 0, 0 }, + { "key-leave-fullscreen", ACTIONID_LEAVE_FULLSCREEN, 0, 0, 0, 0 }, { "key-vol-up", ACTIONID_VOL_UP, 0, 0, 0, 0 }, { "key-vol-down", ACTIONID_VOL_DOWN, 0, 0, 0, 0 }, { "key-vol-mute", ACTIONID_VOL_MUTE, 0, 0, 0, 0 }, @@ -2339,6 +2450,14 @@ const struct hotkey libvlc_hotkeys[] = { "key-dump", ACTIONID_DUMP, 0, 0, 0, 0 }, { "key-random", ACTIONID_RANDOM, 0, 0, 0, 0 }, { "key-loop", ACTIONID_LOOP, 0, 0, 0, 0 }, + { "key-wallpaper", ACTIONID_WALLPAPER, 0, 0, 0, 0 }, + { "key-menu-on", ACTIONID_MENU_ON, 0, 0, 0, 0 }, + { "key-menu-off", ACTIONID_MENU_OFF, 0, 0, 0, 0 }, + { "key-menu-right", ACTIONID_MENU_RIGHT, 0, 0, 0, 0 }, + { "key-menu-left", ACTIONID_MENU_LEFT, 0, 0, 0, 0 }, + { "key-menu-up", ACTIONID_MENU_UP, 0, 0, 0, 0 }, + { "key-menu-down", ACTIONID_MENU_DOWN, 0, 0, 0, 0 }, + { "key-menu-select", ACTIONID_MENU_SELECT, 0, 0, 0, 0 }, { NULL, 0, 0, 0, 0, 0 } };