X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.h;h=e3926c1d4bf92082700fd6d46b4212326a5817f2;hb=95a7988d4f9715267c8881cbdfa4b02f2b5bdd06;hp=15303d96b9e4bb34e107312a8c66bfab103c8147;hpb=6787a19ad2257f54e93220bf06ec590e45ce68c6;p=vlc diff --git a/src/libvlc.h b/src/libvlc.h index 15303d96b9..e3926c1d4b 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -1,12 +1,13 @@ /***************************************************************************** * libvlc.h: main libvlc header ***************************************************************************** - * Copyright (C) 1998-2005 VideoLAN + * Copyright (C) 1998-2005 VideoLAN (Centrale Réseaux) and its contributors * $Id$ * * Authors: Vincent Seguin * Samuel Hocevar * Gildas Bazin + * Jean-Paul Saman * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,13 +28,10 @@ #include "vlc_keys.h" static char *ppsz_language[] = -{ "auto", "en", "en_GB", "bn", "ca", "da", "de", "el", "es", - "fr", "hi", "hu", "it", "ja", "my", "ne", "nl", "no", - "pl", "ps", "pt_BR", "ru", "sv", "tet", "tl", "zh_TW" }; +{ "auto", "en", "en_GB", "ca", "da", "de", "es", + "fr", "it", "ja", "ko", "nl", "pt_BR", "ro", "ru", "tr", "zh_TW" }; static char *ppsz_language_text[] = -{ N_("Auto"), N_("American"), N_("British"), N_("Bengali"), N_("Catalan"), N_("Danish"), N_("German"), N_("Greek"), N_("Spanish"), - N_("French"), N_("Hindi"), N_("Hungarian"), N_("Italian"), N_("Japanese"), N_("Burmese"), N_("Nepali"), N_("Dutch"), N_("Norwegian"), - N_("Polish"), N_("Pashto"), N_("Brazilian"), N_("Russian"), N_("Swedish"), N_("Tetum"), N_("Tagalog"), N_("Chinese Traditional") }; +{ N_("Auto"), N_("American English"), N_("British English"), N_("Catalan"), N_("Danish"), N_("German"), N_("Spanish"), N_("French"), N_("Italian"), N_("Japanese"), N_("Korean"), N_("Dutch"), N_("Brazilian Portuguese"), N_("Romanian"), N_("Russian"), N_("Turkish"), N_("Chinese Traditional") }; static char *ppsz_snap_formats[] = { "png", "jpg" }; @@ -69,12 +67,16 @@ static char *ppsz_snap_formats[] = #define VERBOSE_TEXT N_("Verbosity (0,1,2)") #define VERBOSE_LONGTEXT N_( \ - "This options sets the verbosity level (0=only errors and " \ + "This option sets the verbosity level (0=only errors and " \ "standard messages, 1=warnings, 2=debug).") #define QUIET_TEXT N_("Be quiet") #define QUIET_LONGTEXT N_( \ - "This options turns off all warning and information messages.") + "This option turns off all warning and information messages.") + +#define OPEN_TEXT N_("Open MRL") +#define OPEN_LONGTEXT N_( \ + "This option allows you to open a default MRL on start-up.") #define LANGUAGE_TEXT N_("Language") #define LANGUAGE_LONGTEXT N_( "This option allows you to set the language " \ @@ -122,6 +124,11 @@ static char *ppsz_snap_formats[] = #define VOLUME_SAVE_LONGTEXT N_( \ "This saves the audio output volume when you select mute.") +#define VOLUME_STEP_TEXT N_("Audio output volume step") +#define VOLUME_STEP_LONGTEXT N_( \ + "The step size of the volume is adjustable using this option, " \ + "in a range from 0 to 1024." ) + #define AOUT_RATE_TEXT N_("Audio output frequency (Hz)") #define AOUT_RATE_LONGTEXT N_( \ "You can force the audio output frequency here. Common values are " \ @@ -246,7 +253,7 @@ static char *ppsz_align_descriptions[] = #define VIDEO_DECO_TEXT N_("Window decorations") #define VIDEO_DECO_LONGTEXT N_( \ "If this option is disabled, VLC will avoid creating window caption, " \ - "frames, etc... around the video. Currently only supported on Windows.") + "frames, etc... around the video.") #define FILTER_TEXT N_("Video filter module") #define FILTER_LONGTEXT N_( \ @@ -273,6 +280,12 @@ static char *ppsz_align_descriptions[] = "aspect, or a float value (1.25, 1.3333, etc.) expressing pixel " \ "squareness.") +#define MASPECT_RATIO_TEXT N_("Monitor aspect ratio") +#define MASPECT_RATIO_LONGTEXT N_( \ + "This will force the monitor aspect ratio. Most monitors have a 4:3." \ + "If you have a 16:9 screen, you will need to change this to 16:9 in" \ + "order to keep proportions.") + #define SKIP_FRAMES_TEXT N_("Skip frames") #define SKIP_FRAMES_LONGTEXT N_( \ "Disable this option to disable frame drops on MPEG-2 streams.") @@ -296,6 +309,7 @@ static char *ppsz_align_descriptions[] = #define CLOCK_SYNCHRO_LONGTEXT N_( \ "Allows you to enable/disable the input clock synchronisation for " \ "real-time sources.") + static int pi_clock_values[] = { -1, 0, 1 }; static char *ppsz_clock_descriptions[] = { N_("Default"), N_("Disable"), N_("Enable") }; @@ -324,14 +338,14 @@ static char *ppsz_clock_descriptions[] = #define INPUT_PROGRAM_LONGTEXT N_( \ "Choose the program to select by giving its Service ID.\n" \ "Only use this option if you want to read a multi-program stream " \ - "(like DVB streams for example)" ) + "(like DVB streams for example)." ) #define INPUT_PROGRAMS_TEXT N_("Choose programs") #define INPUT_PROGRAMS_LONGTEXT N_( \ "Choose the programs to select by giving a comma-separated list of " \ - "SIDs\n." \ + "SIDs.\n" \ "Only use this option if you want to read a multi-program stream " \ - "(like DVB streams for example )" ) + "(like DVB streams for example)." ) #define INPUT_AUDIOTRACK_TEXT N_("Choose audio track") #define INPUT_AUDIOTRACK_LONGTEXT N_( \ @@ -369,7 +383,8 @@ static char *ppsz_clock_descriptions[] = #define INPUT_SLAVE_TEXT N_("Input slave (experimental)") #define INPUT_SLAVE_LONGTEXT N_("Allows you to play from several files at " \ - "the same time. Experimental, not all formats are supported.") + "the same time. This feature is experimental, not all formats " \ + "are supported.") #define BOOKMARKS_TEXT N_("Bookmarks list for a stream") #define BOOKMARKS_LONGTEXT N_("You can specify a list of bookmarks for a stream in " \ @@ -481,9 +496,6 @@ static char *ppsz_clock_descriptions[] = #define SOCKS_PASS_LONGTEXT N_("Allows you to modify the password that will " \ "be used for the connection to the SOCKS server.") - - - #define META_TITLE_TEXT N_("Title metadata") #define META_TITLE_LONGTEXT N_( \ "Allows you to specify a \"title\" metadata for an input.") @@ -633,8 +645,8 @@ static char *ppsz_clock_descriptions[] = #define SD_TEXT N_( "Services discovery modules") #define SD_LONGTEXT N_( \ - "Specifies the services discovery modules to load, separated by commas." \ - "Typical values are sap, hal, ..." ) + "Specifies the services discovery modules to load, separated by " \ + "semi-colons. Typical values are sap, hal, ..." ) #define RANDOM_TEXT N_("Play files randomly forever") #define RANDOM_LONGTEXT N_( \ @@ -721,6 +733,12 @@ static char *ppsz_clock_descriptions[] = "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 PLAYLISTENQUEUE_TEXT N_( \ + "Enqueue items to playlist when in one instance mode") +#define PLAYLISTENQUEUE_LONGTEXT N_( \ + "When using the one instance only option, enqueue items to playlist " \ + "and keep playing current item.") + #define HPRIORITY_TEXT N_("Increase the priority of the process") #define HPRIORITY_LONGTEXT N_( \ "Increasing the priority of the process will very likely improve your " \ @@ -772,6 +790,8 @@ static char *ppsz_clock_descriptions[] = #define POSITION_KEY_TEXT N_("Position") #define POSITION_KEY_LONGTEXT N_("Select the hotkey to display the position.") +#define JB3SEC_KEY_TEXT N_("Jump 3 seconds backwards") +#define JB3SEC_KEY_LONGTEXT N_("Select the hotkey to jump 3 seconds backwards.") #define JB10SEC_KEY_TEXT N_("Jump 10 seconds backwards") #define JB10SEC_KEY_LONGTEXT N_("Select the hotkey to jump 10 seconds backwards.") @@ -779,12 +799,14 @@ static char *ppsz_clock_descriptions[] = #define JB1MIN_KEY_LONGTEXT N_("Select the hotkey to jump 1 minute backwards.") #define JB5MIN_KEY_TEXT N_("Jump 5 minutes backwards") #define JB5MIN_KEY_LONGTEXT N_("Select the hotkey to jump 5 minutes backwards.") + +#define JF3SEC_KEY_TEXT N_("Jump 3 seconds forward") +#define JF3SEC_KEY_LONGTEXT N_("Select the hotkey to jump 3 seconds forward.") #define JF10SEC_KEY_TEXT N_("Jump 10 seconds forward") #define JF10SEC_KEY_LONGTEXT N_("Select the hotkey to jump 10 seconds forward.") #define JF1MIN_KEY_TEXT N_("Jump 1 minute forward") #define JF1MIN_KEY_LONGTEXT N_("Select the hotkey to jump 1 minute forward.") - #define JF5MIN_KEY_TEXT N_("Jump 5 minutes forward") #define JF5MIN_KEY_LONGTEXT N_("Select the hotkey to jump 5 minutes forward.") @@ -800,6 +822,14 @@ static char *ppsz_clock_descriptions[] = #define NAV_RIGHT_KEY_LONGTEXT N_("Select the key to move the selector right in DVD menus.") #define NAV_ACTIVATE_KEY_TEXT N_("Activate") #define NAV_ACTIVATE_KEY_LONGTEXT N_("Select the key to activate selected item in DVD menus.") +#define TITLE_PREV_TEXT N_("Select previous DVD title") +#define TITLE_PREV_LONGTEXT N_("Select the key to choose the previous title from the DVD") +#define TITLE_NEXT_TEXT N_("Select next DVD title") +#define TITLE_NEXT_LONGTEXT N_("Select the key to choose the next title from the DVD") +#define CHAPTER_PREV_TEXT N_("Select prev DVD chapter") +#define CHAPTER_PREV_LONGTEXT N_("Select the key to choose the previous chapter from the DVD") +#define CHAPTER_NEXT_TEXT N_("Select prev DVD chapter") +#define CHAPTER_NEXT_LONGTEXT N_("Select the key to choose the next chapter from the DVD") #define VOL_UP_KEY_TEXT N_("Volume up") #define VOL_UP_KEY_LONGTEXT N_("Select the key to increase audio volume.") #define VOL_DOWN_KEY_TEXT N_("Volume down") @@ -848,6 +878,8 @@ static char *ppsz_clock_descriptions[] = #define SUBTITLE_TRACK_KEY_LONGTEXT N_("Cycle through the available subtitle tracks") #define INTF_SHOW_KEY_TEXT N_("Show interface") #define INTF_SHOW_KEY_LONGTEXT N_("Raise the interface above all other windows") +#define INTF_HIDE_KEY_TEXT N_("Hide interface") +#define INTF_HIDE_KEY_LONGTEXT N_("Lower the interface below all other windows") #define SNAP_KEY_TEXT N_("Take video snapshot") #define SNAP_KEY_LONGTEXT N_("Takes a video snapshot and writes it to disk.") @@ -883,7 +915,7 @@ static char *ppsz_clock_descriptions[] = "\n [cdda://][device] Audio CD device" \ "\n udp:[[]@[][:]]" \ "\n UDP stream sent by a streaming server"\ - "\n vlc:pause Special item to pause the playlist" \ + "\n vlc:pause: Special item to pause the playlist for a certain time" \ "\n vlc:quit Special item to quit VLC" \ "\n") @@ -915,6 +947,9 @@ vlc_module_begin(); add_integer_with_range( "volume", AOUT_VOLUME_DEFAULT, AOUT_VOLUME_MIN, AOUT_VOLUME_MAX, NULL, VOLUME_TEXT, VOLUME_LONGTEXT, VLC_FALSE ); + add_integer_with_range( "volume-step", AOUT_VOLUME_STEP, AOUT_VOLUME_MIN, + AOUT_VOLUME_MAX, NULL, VOLUME_STEP_TEXT, + VOLUME_STEP_LONGTEXT, VLC_TRUE ); add_integer( "aout-rate", -1, NULL, AOUT_RATE_TEXT, AOUT_RATE_LONGTEXT, VLC_TRUE ); #if !defined( SYS_DARWIN ) @@ -947,7 +982,7 @@ vlc_module_begin(); FULLSCREEN_LONGTEXT, VLC_FALSE ); change_short('f'); add_bool( "skip-frames", 1, NULL, SKIP_FRAMES_TEXT, - SKIP_FRAMES_LONGTEXT, VLC_TRUE ); + SKIP_FRAMES_LONGTEXT, VLC_FALSE ); add_bool( "quiet-synchro", 0, NULL, QUIET_SYNCHRO_TEXT, QUIET_SYNCHRO_LONGTEXT, VLC_TRUE ); #ifndef SYS_DARWIN @@ -960,7 +995,7 @@ vlc_module_begin(); add_directory( "snapshot-path", NULL, NULL, SNAP_PATH_TEXT, SNAP_PATH_LONGTEXT, VLC_FALSE ); add_string( "snapshot-format", "png", NULL, SNAP_FORMAT_TEXT, - SNAP_FORMAT_LONGTEXT, VLC_TRUE ); + SNAP_FORMAT_LONGTEXT, VLC_FALSE ); change_string_list( ppsz_snap_formats, NULL, 0 ); set_section( N_("Window properties" ), NULL ); @@ -969,7 +1004,9 @@ vlc_module_begin(); add_integer( "video-x", -1, NULL, VIDEOX_TEXT, VIDEOX_LONGTEXT, VLC_TRUE ); add_integer( "video-y", -1, NULL, VIDEOY_TEXT, VIDEOY_LONGTEXT, VLC_TRUE ); add_string( "aspect-ratio", "", NULL, - ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, VLC_TRUE ); + ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, VLC_FALSE ); + add_string( "monitor-aspect-ratio", "4:3", NULL, + MASPECT_RATIO_TEXT, MASPECT_RATIO_LONGTEXT, VLC_FALSE ); add_bool( "video-deco", 1, NULL, VIDEO_DECO_TEXT, VIDEO_DECO_LONGTEXT, VLC_TRUE ); add_string( "video-title", NULL, NULL, VIDEO_TITLE_TEXT, @@ -1017,7 +1054,7 @@ vlc_module_begin(); add_deprecated( "spu-margin", VLC_FALSE ); /*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_TRUE ); + SUB_FILTER_TEXT, SUB_FILTER_LONGTEXT, VLC_FALSE ); /* Input options */ set_category( CAT_INPUT ); @@ -1075,7 +1112,7 @@ vlc_module_begin(); set_section( N_( "Default devices") , NULL ) - add_file( "dvd", DVD_DEVICE, NULL, DVD_DEV_TEXT, DVD_DEV_LONGTEXT, + add_file( "dvd", NULL, NULL, DVD_DEV_TEXT, DVD_DEV_LONGTEXT, VLC_FALSE ); add_file( "vcd", VCD_DEVICE, NULL, VCD_DEV_TEXT, VCD_DEV_LONGTEXT, VLC_FALSE ); @@ -1211,7 +1248,7 @@ vlc_module_begin(); add_bool( "minimize-threads", 0, NULL, MINIMIZE_THREADS_TEXT, MINIMIZE_THREADS_LONGTEXT, VLC_TRUE ); -#if !defined(SYS_DARWIN) && !defined(SYS_BEOS) && defined(PTHREAD_COND_T_IN_PTHREAD_H) +#if !defined(SYS_BEOS) && defined(PTHREAD_COND_T_IN_PTHREAD_H) add_bool( "rt-priority", 0, NULL, RT_PRIORITY_TEXT, RT_PRIORITY_LONGTEXT, VLC_TRUE ); #endif @@ -1224,6 +1261,8 @@ vlc_module_begin(); #if defined(WIN32) add_bool( "one-instance", 0, NULL, ONEINSTANCE_TEXT, ONEINSTANCE_LONGTEXT, VLC_TRUE ); + add_bool( "playlist-enqueue", 0, NULL, PLAYLISTENQUEUE_TEXT, + PLAYLISTENQUEUE_LONGTEXT, VLC_TRUE ); add_bool( "high-priority", 0, NULL, HPRIORITY_TEXT, HPRIORITY_LONGTEXT, VLC_FALSE ); add_bool( "fast-mutex", 0, NULL, FAST_MUTEX_TEXT, @@ -1253,6 +1292,8 @@ vlc_module_begin(); change_short('R'); add_bool( "play-and-stop", 0, NULL, PAS_TEXT, PAS_LONGTEXT, VLC_FALSE ); + add_string( "open", "", NULL, OPEN_TEXT, OPEN_LONGTEXT, VLC_FALSE ); + set_subcategory( SUBCAT_PLAYLIST_SD ); add_module_list_cat( "services-discovery", SUBCAT_PLAYLIST_SD, NULL, NULL, SD_TEXT, SD_LONGTEXT, VLC_FALSE ); @@ -1332,6 +1373,8 @@ vlc_module_begin(); # define KEY_PREV KEY_MODIFIER_COMMAND|KEY_LEFT # define KEY_STOP KEY_MODIFIER_COMMAND|'.' # define KEY_POSITION 't' +# define KEY_JUMP_M3SEC KEY_MODIFIER_COMMAND|KEY_MODIFIER_CTRL|KEY_LEFT +# define KEY_JUMP_P3SEC KEY_MODIFIER_COMMAND|KEY_MODIFIER_CTRL|KEY_RIGHT # define KEY_JUMP_M10SEC KEY_MODIFIER_COMMAND|KEY_MODIFIER_ALT|KEY_LEFT # define KEY_JUMP_P10SEC KEY_MODIFIER_COMMAND|KEY_MODIFIER_ALT|KEY_RIGHT # define KEY_JUMP_M1MIN KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|KEY_LEFT @@ -1346,7 +1389,7 @@ vlc_module_begin(); # define KEY_QUIT KEY_MODIFIER_COMMAND|'q' # define KEY_VOL_UP KEY_MODIFIER_COMMAND|KEY_UP # define KEY_VOL_DOWN KEY_MODIFIER_COMMAND|KEY_DOWN -# define KEY_VOL_MUTE KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'m' +# define KEY_VOL_MUTE KEY_MODIFIER_COMMAND|KEY_MODIFIER_ALT|KEY_DOWN # define KEY_SUBDELAY_UP 'j' # define KEY_SUBDELAY_DOWN 'h' # define KEY_AUDIODELAY_UP 'g' @@ -1354,6 +1397,11 @@ vlc_module_begin(); # define KEY_AUDIO_TRACK 'l' # define KEY_SUBTITLE_TRACK 's' # define KEY_INTF_SHOW 'i' +# define KEY_INTF_HIDE 'I' +# define KEY_TITLE_PREV KEY_MODIFIER_CTRL|'p' +# define KEY_TITLE_NEXT KEY_MODIFIER_CTRL|'n' +# define KEY_CHAPTER_PREV KEY_MODIFIER_CTRL|'u' +# define KEY_CHAPTER_NEXT KEY_MODIFIER_CTRL|'d' # define KEY_SNAPSHOT KEY_MODIFIER_COMMAND|KEY_MODIFIER_ALT|'s' # define KEY_SET_BOOKMARK1 KEY_MODIFIER_COMMAND|KEY_F1 @@ -1391,6 +1439,8 @@ vlc_module_begin(); # define KEY_PREV 'p' # define KEY_STOP 's' # define KEY_POSITION 't' +# define KEY_JUMP_M3SEC KEY_MODIFIER_SHIFT|KEY_LEFT +# define KEY_JUMP_P3SEC KEY_MODIFIER_SHIFT|KEY_RIGHT # define KEY_JUMP_M10SEC KEY_MODIFIER_ALT|KEY_LEFT # define KEY_JUMP_P10SEC KEY_MODIFIER_ALT|KEY_RIGHT # define KEY_JUMP_M1MIN KEY_MODIFIER_CTRL|KEY_LEFT @@ -1414,6 +1464,11 @@ vlc_module_begin(); # define KEY_AUDIO_TRACK 'l' # define KEY_SUBTITLE_TRACK 'k' # define KEY_INTF_SHOW 'i' +# define KEY_INTF_HIDE 'I' +# define KEY_TITLE_PREV KEY_MODIFIER_CTRL|'p' +# define KEY_TITLE_NEXT KEY_MODIFIER_CTRL|'n' +# define KEY_CHAPTER_PREV KEY_MODIFIER_CTRL|'u' +# define KEY_CHAPTER_NEXT KEY_MODIFIER_CTRL|'d' # define KEY_SNAPSHOT KEY_MODIFIER_CTRL|KEY_MODIFIER_ALT|'s' # define KEY_SET_BOOKMARK1 KEY_MODIFIER_CTRL|KEY_F1 @@ -1461,6 +1516,10 @@ vlc_module_begin(); STOP_KEY_LONGTEXT, VLC_FALSE ); add_key( "key-position", KEY_POSITION, NULL, POSITION_KEY_TEXT, POSITION_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-jump-3sec", KEY_JUMP_M3SEC, NULL, JB3SEC_KEY_TEXT, + JB3SEC_KEY_LONGTEXT, VLC_FALSE ); + add_key( "key-jump+3sec", KEY_JUMP_P3SEC, NULL, JF3SEC_KEY_TEXT, + JF3SEC_KEY_LONGTEXT, VLC_FALSE ); add_key( "key-jump-10sec", KEY_JUMP_M10SEC, NULL, JB10SEC_KEY_TEXT, JB10SEC_KEY_LONGTEXT, VLC_FALSE ); add_key( "key-jump+10sec", KEY_JUMP_P10SEC, NULL, JF10SEC_KEY_TEXT, @@ -1485,6 +1544,15 @@ vlc_module_begin(); add_key( "key-nav-right", KEY_NAV_RIGHT, NULL, NAV_RIGHT_KEY_TEXT, NAV_RIGHT_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-title-prev", KEY_TITLE_PREV, NULL, TITLE_PREV_TEXT, + TITLE_PREV_LONGTEXT, VLC_TRUE ); + add_key( "key-title-next", KEY_TITLE_NEXT, NULL, TITLE_NEXT_TEXT, + TITLE_NEXT_LONGTEXT, VLC_TRUE ); + add_key( "key-chapter-prev", KEY_CHAPTER_PREV, NULL, CHAPTER_PREV_TEXT, + CHAPTER_PREV_LONGTEXT, VLC_TRUE ); + add_key( "key-chapter-next", KEY_CHAPTER_NEXT, NULL, CHAPTER_NEXT_TEXT, + CHAPTER_NEXT_LONGTEXT, VLC_TRUE ); + add_key( "key-quit", KEY_QUIT, NULL, QUIT_KEY_TEXT, QUIT_KEY_LONGTEXT, VLC_FALSE ); add_key( "key-vol-up", KEY_VOL_UP, NULL, VOL_UP_KEY_TEXT, @@ -1507,6 +1575,8 @@ vlc_module_begin(); SUBTITLE_TRACK_KEY_TEXT, SUBTITLE_TRACK_KEY_LONGTEXT, VLC_FALSE ); add_key( "key-intf-show", KEY_INTF_SHOW, NULL, INTF_SHOW_KEY_TEXT, INTF_SHOW_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-intf-hide", KEY_INTF_HIDE, NULL, + INTF_HIDE_KEY_TEXT, INTF_HIDE_KEY_LONGTEXT, VLC_TRUE ); add_key( "key-snapshot", KEY_SNAPSHOT, NULL, SNAP_KEY_TEXT, SNAP_KEY_LONGTEXT, VLC_TRUE ); @@ -1600,62 +1670,68 @@ static module_config_t p_help_config[] = *****************************************************************************/ static struct hotkey p_hotkeys[] = { - { "key-quit", ACTIONID_QUIT, 0 }, - { "key-play-pause", ACTIONID_PLAY_PAUSE, 0 }, - { "key-play", ACTIONID_PLAY, 0 }, - { "key-pause", ACTIONID_PAUSE, 0 }, - { "key-stop", ACTIONID_STOP, 0 }, - { "key-position", ACTIONID_POSITION, 0 }, - { "key-jump-10sec", ACTIONID_JUMP_BACKWARD_10SEC, 0 }, - { "key-jump+10sec", ACTIONID_JUMP_FORWARD_10SEC, 0 }, - { "key-jump-1min", ACTIONID_JUMP_BACKWARD_1MIN, 0 }, - { "key-jump+1min", ACTIONID_JUMP_FORWARD_1MIN, 0 }, - { "key-jump-5min", ACTIONID_JUMP_BACKWARD_5MIN, 0 }, - { "key-jump+5min", ACTIONID_JUMP_FORWARD_5MIN, 0 }, - { "key-prev", ACTIONID_PREV, 0 }, - { "key-next", ACTIONID_NEXT, 0 }, - { "key-faster", ACTIONID_FASTER, 0 }, - { "key-slower", ACTIONID_SLOWER, 0 }, - { "key-fullscreen", ACTIONID_FULLSCREEN, 0 }, - { "key-vol-up", ACTIONID_VOL_UP, 0 }, - { "key-vol-down", ACTIONID_VOL_DOWN, 0 }, - { "key-vol-mute", ACTIONID_VOL_MUTE, 0 }, - { "key-subdelay-down", ACTIONID_SUBDELAY_DOWN, 0 }, - { "key-subdelay-up", ACTIONID_SUBDELAY_UP, 0 }, - { "key-audiodelay-down", ACTIONID_AUDIODELAY_DOWN, 0 }, - { "key-audiodelay-up", ACTIONID_AUDIODELAY_UP, 0 }, - { "key-audio-track", ACTIONID_AUDIO_TRACK, 0}, - { "key-subtitle-track", ACTIONID_SUBTITLE_TRACK, 0}, - { "key-intf-show", ACTIONID_INTF_SHOW, 0}, - { "key-snapshot", ACTIONID_SNAPSHOT, 0}, - { "key-nav-activate", ACTIONID_NAV_ACTIVATE, 0 }, - { "key-nav-up", ACTIONID_NAV_UP, 0 }, - { "key-nav-down", ACTIONID_NAV_DOWN, 0 }, - { "key-nav-left", ACTIONID_NAV_LEFT, 0 }, - { "key-nav-right", ACTIONID_NAV_RIGHT, 0 }, - { "key-set-bookmark1", ACTIONID_SET_BOOKMARK1, 0}, - { "key-set-bookmark2", ACTIONID_SET_BOOKMARK2, 0}, - { "key-set-bookmark3", ACTIONID_SET_BOOKMARK3, 0}, - { "key-set-bookmark4", ACTIONID_SET_BOOKMARK4, 0}, - { "key-set-bookmark5", ACTIONID_SET_BOOKMARK5, 0}, - { "key-set-bookmark6", ACTIONID_SET_BOOKMARK6, 0}, - { "key-set-bookmark7", ACTIONID_SET_BOOKMARK7, 0}, - { "key-set-bookmark8", ACTIONID_SET_BOOKMARK8, 0}, - { "key-set-bookmark9", ACTIONID_SET_BOOKMARK9, 0}, - { "key-set-bookmark10", ACTIONID_SET_BOOKMARK10, 0}, - { "key-play-bookmark1", ACTIONID_PLAY_BOOKMARK1, 0}, - { "key-play-bookmark2", ACTIONID_PLAY_BOOKMARK2, 0}, - { "key-play-bookmark3", ACTIONID_PLAY_BOOKMARK3, 0}, - { "key-play-bookmark4", ACTIONID_PLAY_BOOKMARK4, 0}, - { "key-play-bookmark5", ACTIONID_PLAY_BOOKMARK5, 0}, - { "key-play-bookmark6", ACTIONID_PLAY_BOOKMARK6, 0}, - { "key-play-bookmark7", ACTIONID_PLAY_BOOKMARK7, 0}, - { "key-play-bookmark8", ACTIONID_PLAY_BOOKMARK8, 0}, - { "key-play-bookmark9", ACTIONID_PLAY_BOOKMARK9, 0}, - { "key-play-bookmark10", ACTIONID_PLAY_BOOKMARK10, 0}, - { "key-history-back", ACTIONID_HISTORY_BACK, 0}, - { "key-history-forward", ACTIONID_HISTORY_FORWARD, 0}, - { "key-record", ACTIONID_RECORD, 0 }, - { NULL, 0, 0 } + { "key-quit", ACTIONID_QUIT, 0, 0, 0, 0 }, + { "key-play-pause", ACTIONID_PLAY_PAUSE, 0, 0, 0, 0 }, + { "key-play", ACTIONID_PLAY, 0, 0, 0, 0 }, + { "key-pause", ACTIONID_PAUSE, 0, 0, 0, 0 }, + { "key-stop", ACTIONID_STOP, 0, 0, 0, 0 }, + { "key-position", ACTIONID_POSITION, 0, 0, 0, 0 }, + { "key-jump-3sec", ACTIONID_JUMP_BACKWARD_3SEC, 0, 1000000, 0, 0 }, + { "key-jump+3sec", ACTIONID_JUMP_FORWARD_3SEC, 0, 1000000, 0, 0 }, + { "key-jump-10sec", ACTIONID_JUMP_BACKWARD_10SEC, 0, 1000000, 0, 0 }, + { "key-jump+10sec", ACTIONID_JUMP_FORWARD_10SEC, 0, 1000000, 0, 0 }, + { "key-jump-1min", ACTIONID_JUMP_BACKWARD_1MIN, 0, 1000000, 0, 0 }, + { "key-jump+1min", ACTIONID_JUMP_FORWARD_1MIN, 0, 1000000, 0, 0 }, + { "key-jump-5min", ACTIONID_JUMP_BACKWARD_5MIN, 0, 1000000, 0, 0 }, + { "key-jump+5min", ACTIONID_JUMP_FORWARD_5MIN, 0, 1000000, 0, 0 }, + { "key-prev", ACTIONID_PREV, 0, 0, 0, 0 }, + { "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-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 }, + { "key-subdelay-down", ACTIONID_SUBDELAY_DOWN, 0, 0, 0, 0 }, + { "key-subdelay-up", ACTIONID_SUBDELAY_UP, 0, 0, 0, 0 }, + { "key-audiodelay-down", ACTIONID_AUDIODELAY_DOWN, 0, 0, 0, 0 }, + { "key-audiodelay-up", ACTIONID_AUDIODELAY_UP, 0, 0, 0, 0 }, + { "key-audio-track", ACTIONID_AUDIO_TRACK, 0, 0, 0, 0 }, + { "key-subtitle-track", ACTIONID_SUBTITLE_TRACK, 0, 0, 0, 0 }, + { "key-intf-show", ACTIONID_INTF_SHOW, 0, 0, 0, 0 }, + { "key-intf-hide", ACTIONID_INTF_HIDE, 0, 0, 0, 0 }, + { "key-snapshot", ACTIONID_SNAPSHOT, 0, 0, 0, 0 }, + { "key-nav-activate", ACTIONID_NAV_ACTIVATE, 0, 0, 0, 0 }, + { "key-nav-up", ACTIONID_NAV_UP, 0, 0, 0, 0 }, + { "key-nav-down", ACTIONID_NAV_DOWN, 0, 0, 0, 0 }, + { "key-nav-left", ACTIONID_NAV_LEFT, 0, 0, 0, 0 }, + { "key-nav-right", ACTIONID_NAV_RIGHT, 0, 0, 0, 0 }, + { "key-title-prev", ACTIONID_TITLE_PREV, 0, 0, 0, 0 }, + { "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-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 }, + { "key-set-bookmark4", ACTIONID_SET_BOOKMARK4, 0, 0, 0, 0 }, + { "key-set-bookmark5", ACTIONID_SET_BOOKMARK5, 0, 0, 0, 0 }, + { "key-set-bookmark6", ACTIONID_SET_BOOKMARK6, 0, 0, 0, 0 }, + { "key-set-bookmark7", ACTIONID_SET_BOOKMARK7, 0, 0, 0, 0 }, + { "key-set-bookmark8", ACTIONID_SET_BOOKMARK8, 0, 0, 0, 0 }, + { "key-set-bookmark9", ACTIONID_SET_BOOKMARK9, 0, 0, 0, 0 }, + { "key-set-bookmark10", ACTIONID_SET_BOOKMARK10, 0, 0, 0, 0 }, + { "key-play-bookmark1", ACTIONID_PLAY_BOOKMARK1, 0, 0, 0, 0 }, + { "key-play-bookmark2", ACTIONID_PLAY_BOOKMARK2, 0, 0, 0, 0 }, + { "key-play-bookmark3", ACTIONID_PLAY_BOOKMARK3, 0, 0, 0, 0 }, + { "key-play-bookmark4", ACTIONID_PLAY_BOOKMARK4, 0, 0, 0, 0 }, + { "key-play-bookmark5", ACTIONID_PLAY_BOOKMARK5, 0, 0, 0, 0 }, + { "key-play-bookmark6", ACTIONID_PLAY_BOOKMARK6, 0, 0, 0, 0 }, + { "key-play-bookmark7", ACTIONID_PLAY_BOOKMARK7, 0, 0, 0, 0 }, + { "key-play-bookmark8", ACTIONID_PLAY_BOOKMARK8, 0, 0, 0, 0 }, + { "key-play-bookmark9", ACTIONID_PLAY_BOOKMARK9, 0, 0, 0, 0 }, + { "key-play-bookmark10", ACTIONID_PLAY_BOOKMARK10, 0, 0, 0, 0 }, + { "key-history-back", ACTIONID_HISTORY_BACK, 0, 0, 0, 0 }, + { "key-history-forward", ACTIONID_HISTORY_FORWARD, 0, 0, 0, 0 }, + { "key-record", ACTIONID_RECORD, 0, 0, 0, 0 }, + { NULL, 0, 0, 0, 0, 0 } }; -