X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.h;h=53c1336c6027c2bc812c6a74d48c6819641bb546;hb=51d84ecbc8c0959991a795a442176faa85880b92;hp=3bcd4908703c4b67470c01670948b35d9be8769d;hpb=b16f809c5d45b840e6306c19a3362e88b0f88214;p=vlc diff --git a/src/libvlc.h b/src/libvlc.h index 3bcd490870..53c1336c60 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -2,7 +2,7 @@ * libvlc.h: main libvlc header ***************************************************************************** * Copyright (C) 1998-2002 VideoLAN - * $Id: libvlc.h,v 1.130 2004/01/25 13:50:33 zorglub Exp $ + * $Id$ * * Authors: Vincent Seguin * Samuel Hocevar @@ -32,8 +32,9 @@ static char *ppsz_language[] = "pl", "pt_BR", "ru", "sv" }; static char *ppsz_language_text[] = { N_("Auto"), N_("American"), N_("British"), N_("Spanish"), N_("German"), - N_("French"), N_("Hungarian"), N_("Italian"), N_("Japanese"), N_("Dutch"), N_("Norwegian"), - N_("Polish"), N_("Brazilian"), N_("Russian"), N_("Swedish") }; + N_("French"), N_("Hungarian"), N_("Italian"), N_("Japanese"), N_("Dutch"), + N_("Norwegian"), N_("Polish"), N_("Brazilian"), N_("Russian"), + N_("Swedish") }; /***************************************************************************** * Configuration options for the main program. Each module will also separatly @@ -58,7 +59,7 @@ static char *ppsz_language_text[] = "This option allows you to select additional interfaces used by VLC. " \ "They will be launched in the background in addition to the default " \ "interface. Use a comma separated list of interface modules. (common " \ - "values are: logger,gestures,sap,rc,http,screensaver)") + "values are logger, gestures, sap, rc, http or screensaver)") #define VERBOSE_TEXT N_("Verbosity (0,1,2)") #define VERBOSE_LONGTEXT N_( \ @@ -85,20 +86,10 @@ static char *ppsz_language_text[] = "show all the available options, including those that most users should " \ "never touch.") -#define INTF_PATH_TEXT N_("Interface default search path") -#define INTF_PATH_LONGTEXT N_( \ - "This option allows you to set the default path that the interface will " \ - "open when looking for a file.") - -#define PLUGIN_PATH_TEXT N_("Modules search path") -#define PLUGIN_PATH_LONGTEXT N_( \ - "This option allows you to specify an additional path for VLC to look " \ - "for its modules.") - #define AOUT_CAT_LONGTEXT N_( \ - "These options allow you to modify the behaviour of the audio " \ + "These options allow you to modify the behavior of the audio " \ "subsystem, and to add audio filters which can be used for " \ - "postprocessing or visual effects (spectrum analyzer, ...).\n" \ + "post processing or visual effects (spectrum analyzer, ...).\n" \ "Enable these filters here, and configure them in the \"audio filters\" " \ "modules section.") @@ -157,28 +148,20 @@ static char *ppsz_language_text[] = #define AUDIO_FILTER_TEXT N_("Audio filters") #define AUDIO_FILTER_LONGTEXT N_( \ - "This allows you to add audio postprocessing filters, to modify " \ + "This allows you to add audio post processing filters, to modify " \ "the sound, or audio visualization modules (spectrum analyzer, ...).") #define AUDIO_CHANNEL_MIXER N_("Channel mixer") -#if 0 -#define AUDIO_CHANNEL_MIXER_LONGTEXT N_( \ - "This allows you to choose a specific audio channel mixer. For instance " \ - "the headphone channel mixer will downmix any audio source to a stereo " \ - "output and give the feeling that you are standing in a room with a " \ - "complete 5.1 speaker set when using only a headphone.") -#endif - #define AUDIO_CHANNEL_MIXER_LONGTEXT N_( \ "This allows you to choose a specific audio channel mixer. For " \ "instance, you can use the \"headphone\" mixer that gives 5.1 feeling " \ "with a headphone.") #define VOUT_CAT_LONGTEXT N_( \ - "These options allow you to modify the behaviour of the video output " \ - "subsytem. You can for example enable video filters (deinterlacing, " \ - "image adjusting, ...\n ). Enable these filters here and configure " \ - "them in the \"video filters\" modules section. You can also set many" \ + "These options allow you to modify the behavior of the video output " \ + "subsystem. You can for example enable video filters (deinterlacing, " \ + "image adjusting, ...). Enable these filters here and configure " \ + "them in the \"video filters\" modules section. You can also set many " \ "miscellaneous video options." ) #define VOUT_TEXT N_("Video output module") @@ -202,17 +185,29 @@ static char *ppsz_language_text[] = "You can enforce the video height here. By default (-1) VLC will " \ "adapt to the video characteristics.") +#define VIDEOX_TEXT N_("Video x coordinate") +#define VIDEOX_LONGTEXT N_( \ + "You can enforce the position of the top left corner of the video window "\ + "here (x coordinate).") + +#define VIDEOY_TEXT N_("Video y coordinate") +#define VIDEOY_LONGTEXT N_( \ + "You can enforce the position of the top left corner of the video window "\ + "here (y coordinate).") + +#define VIDEO_TITLE_TEXT N_("Video title") +#define VIDEO_TITLE_LONGTEXT N_( \ + "You can specify a custom video window title here.") + #define ALIGN_TEXT N_("Video alignment") #define ALIGN_LONGTEXT N_( \ - "You can enforce the video alignement in its window. By default (0) it " \ + "You can enforce the video alignment in its window. By default (0) it " \ "will be centered (0=center, 1=left, 2=right, 4=top, 8=bottom, you can " \ "also use combinations of these values).") static int pi_align_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 }; -static char *ppsz_align_descriptions[] = { N_("Center"), - N_("Left"), N_("Right"), - N_("Top"), N_("Bottom"), - N_("Top-Left"), N_("Top-Right"), - N_("Bottom-Left"), N_("Bottom-Right")}; +static char *ppsz_align_descriptions[] = +{ N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"), + N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") }; #define ZOOM_TEXT N_("Zoom video") #define ZOOM_LONGTEXT N_( \ @@ -262,18 +257,8 @@ static char *ppsz_align_descriptions[] = { N_("Center"), "aspect, or a float value (1.25, 1.3333, etc.) expressing pixel " \ "squareness.") -#if 0 -#define PIXEL_RATIO_TEXT N_("Destination aspect ratio") -#define PIXEL_RATIO_LONGTEXT N_( \ - "This will force the destination pixel size. By default VLC assumes " \ - "your pixels are square, unless your hardware has a way to tell it " \ - "otherwise. This may be used when you output VLC's signal to another " \ - "device such as a TV set. Accepted format is a float value (1, 1.25, " \ - "1.3333, etc.) expressing pixel squareness.") -#endif - #define INPUT_CAT_LONGTEXT N_( \ - "These options allow you to modify the behaviour of the input " \ + "These options allow you to modify the behavior of the input " \ "subsystem, such as the DVD or VCD device, the network interface " \ "settings or the subtitle channel.") @@ -321,31 +306,53 @@ static char *ppsz_align_descriptions[] = { N_("Center"), "Give the stream number of the subtitle channel you want to use " \ "(from 1 to n).") +#define INPUT_REPEAT_TEXT N_("Number of time the same input will be repeated") +#define INPUT_REPEAT_LONGTEXT N_("Number of time the same input will be repeated") + +#define START_TIME_TEXT N_("Input start time (seconds)") +#define START_TIME_LONGTEXT N_("Input start time (seconds)") + +#define STOP_TIME_TEXT N_("Input stop time (seconds)") +#define STOP_TIME_LONGTEXT N_("Input stop time (seconds)") + +#define INPUT_SLAVE_TEXT N_("Input slave (experimental)") +#define INPUT_SLAVE_LONGTEXT N_("Input slave (experimental)") + +#define BOOKMARKS_TEXT N_("Bookmarks list for a stream") +#define BOOKMARKS_LONGTEXT N_("You can specify a list of bookmarks for a stream in " \ + "the form \"{name=bookmark-name,time=optional-time-offset," \ + "bytes=optional-byte-offset},{etc...}\"") + #define SUB_AUTO_TEXT N_("Autodetect subtitle files") #define SUB_AUTO_LONGTEXT \ - "Automatically detect a subtitle file, if no subtitle filename is " \ - "specified." + N_("Automatically detect a subtitle file, if no subtitle filename is " \ + "specified.") -#define SUB_FUZZY_TEXT N_("Subtitle autodection fuzziness") +#define SUB_FUZZY_TEXT N_("Subtitle autodetection fuzziness") #define SUB_FUZZY_LONGTEXT \ - "This determines how fuzzy subtitle and movie filenaming matching " \ + N_("This determines how fuzzy subtitle and movie filename matching " \ "will be. Options are:\n" \ "0 = no subtitles autodetected\n" \ "1 = any subtitle file\n" \ "2 = any subtitle file containing the movie name\n" \ "3 = subtitle file matching the movie name with additional chars\n" \ - "4 = subtitle file matching the movie name exactly" + "4 = subtitle file matching the movie name exactly") + +#define SUB_PATH_TEXT N_("Subtitle autodetection paths") +#define SUB_PATH_LONGTEXT \ + N_("Look for a subtitle file in those paths too, if your subtitle " \ + "file was not found in the current directory.") #define SUB_FILE_TEXT N_("Use subtitle file") #define SUB_FILE_LONGTEXT \ - "Load this subtitle file. To be used when autodetect cannot detect " \ - "your subtitlefile." + N_("Load this subtitle file. To be used when autodetect cannot detect " \ + "your subtitle file.") #define DVD_DEV_TEXT N_("DVD device") #ifdef WIN32 #define DVD_DEV_LONGTEXT N_( \ "This is the default DVD drive (or file) to use. Don't forget the colon " \ - "after the drive letter (eg D:)") + "after the drive letter (eg. D:)") #else #define DVD_DEV_LONGTEXT N_( \ "This is the default DVD device to use.") @@ -381,6 +388,38 @@ static char *ppsz_align_descriptions[] = { N_("Center"), "If you check this box, IPv4 will be used by default for all UDP and " \ "HTTP connections.") +#define META_TITLE_TEXT N_("Title metadata") +#define META_TITLE_LONGTEXT N_( \ + "Allows you to specify a \"title\" metadata for an input.") + +#define META_AUTHOR_TEXT N_("Author metadata") +#define META_AUTHOR_LONGTEXT N_( \ + "Allows you to specify an \"author\" metadata for an input.") + +#define META_ARTIST_TEXT N_("Artist metadata") +#define META_ARTIST_LONGTEXT N_( \ + "Allows you to specify an \"artist\" metadata for an input.") + +#define META_GENRE_TEXT N_("Genre metadata") +#define META_GENRE_LONGTEXT N_( \ + "Allows you to specify a \"genre\" metadata for an input.") + +#define META_CPYR_TEXT N_("Copyright metadata") +#define META_CPYR_LONGTEXT N_( \ + "Allows you to specify a \"copyright\" metadata for an input.") + +#define META_DESCR_TEXT N_("Description metadata") +#define META_DESCR_LONGTEXT N_( \ + "Allows you to specify a \"description\" metadata for an input.") + +#define META_DATE_TEXT N_("Date metadata") +#define META_DATE_LONGTEXT N_( \ + "Allows you to specify a \"date\" metadata for an input.") + +#define META_URL_TEXT N_("URL metadata") +#define META_URL_LONGTEXT N_( \ + "Allows you to specify a \"url\" metadata for an input.") + #define CODEC_CAT_LONGTEXT N_( \ "This option can be used to alter the way VLC selects " \ "its codecs (decompression methods). Only advanced users should " \ @@ -423,10 +462,10 @@ static char *ppsz_align_descriptions[] = { N_("Center"), "This allows you to choose if the video stream should be redirected to " \ "the stream output facility when this last one is enabled.") -#define SOUT_KEEP_TEXT N_("Keep sout open" ) +#define SOUT_KEEP_TEXT N_("Keep stream output open" ) #define SOUT_KEEP_LONGTEXT N_( \ - "This allows you to keep an unique sout instance across " \ - "multiple playlist item (automatically insert gather stream_out " \ + "This allows you to keep an unique stream output instance across " \ + "multiple playlist item (automatically insert the gather stream output " \ "if not specified)" ) #define PACKETIZER_TEXT N_("Preferred packetizer list") @@ -442,6 +481,15 @@ static char *ppsz_align_descriptions[] = { N_("Center"), #define ACCESS_OUTPUT_LONGTEXT N_( \ "This is a legacy entry to let you configure access output modules") +#define ANN_SAPCTRL_TEXT N_("Control SAP flow") +#define ANN_SAPCTRL_LONGTEXT N_("If this option is enabled, the flow on " \ + "the SAP multicast address will be controlled. This is needed if you " \ + "want to make announcements on the MBone" ) + +#define ANN_SAPINTV_TEXT N_("SAP announcement interval") +#define ANN_SAPINTV_LONGTEXT N_("When the SAP flow control is disabled, " \ + "this lets you set the fixed interval between SAP announcements" ) + #define CPU_CAT_LONGTEXT N_( \ "These options allow you to enable special CPU optimizations.\n" \ "You should always leave all these enabled." ) @@ -466,6 +514,11 @@ static char *ppsz_align_descriptions[] = { N_("Center"), "If your processor supports the SSE instructions set, VLC can take " \ "advantage of them.") +#define SSE2_TEXT N_("Enable CPU SSE2 support") +#define SSE2_LONGTEXT N_( \ + "If your processor supports the SSE2 instructions set, VLC can take " \ + "advantage of them.") + #define ALTIVEC_TEXT N_("Enable CPU AltiVec support") #define ALTIVEC_LONGTEXT N_( \ "If your processor supports the AltiVec instructions set, VLC can take " \ @@ -473,7 +526,7 @@ static char *ppsz_align_descriptions[] = { N_("Center"), #define PLAYLIST_CAT_LONGTEXT N_( \ "These options define the behavior of the playlist. Some " \ - "of them can be overriden in the playlist dialog box." ) + "of them can be overridden in the playlist dialog box." ) #define RANDOM_TEXT N_("Play files randomly forever") #define RANDOM_LONGTEXT N_( \ @@ -490,6 +543,11 @@ static char *ppsz_align_descriptions[] = { N_("Center"), "When this is active, VLC will keep playing the current playlist item " \ "over and over again.") +#define PAS_TEXT N_("Play and stop") +#define PAS_LONGTEXT N_( \ + "Stop the playlist after each played playlistitem." \ + "Does advance the playlistindex.") + #define MISC_CAT_LONGTEXT N_( \ "These options allow you to select default modules. Leave these " \ "alone unless you really know what you are doing." ) @@ -515,10 +573,30 @@ static char *ppsz_align_descriptions[] = { N_("Center"), "slow. You should only activate this if you know what you're " \ "doing.") -#define MINIMIZE_THREADS_TXT N_("Minimize number of threads") -#define MINIMIZE_THREADS_LONGTXT N_( \ +#define RT_OFFSET_TEXT N_("Adjust VLC priority") +#define RT_OFFSET_LONGTEXT N_( \ + "This option adds an offset (positive or negative) to VLC default " \ + "priorities. You can use it to tune VLC priority against other " \ + "programs, or against other VLC instances.") + +#define MINIMIZE_THREADS_TEXT N_("Minimize number of threads") +#define MINIMIZE_THREADS_LONGTEXT N_( \ "This option minimizes the number of threads needed to run VLC") +#define PLUGIN_PATH_TEXT N_("Modules search path") +#define PLUGIN_PATH_LONGTEXT N_( \ + "This option allows you to specify an additional path for VLC to look " \ + "for its modules.") + +#define PLUGINS_CACHE_TEXT N_("Use a plugins cache") +#define PLUGINS_CACHE_LONGTEXT N_( \ + "This option allows you to use a plugins cache which will greatly " \ + "improve the start time of VLC.") + +#define DAEMON_TEXT N_("Run as daemon process") +#define DAEMON_LONGTEXT N_( \ + "Runs VLC as a background daemon process.") + #define ONEINSTANCE_TEXT N_("Allow only one running instance") #define ONEINSTANCE_LONGTEXT N_( \ "Allowing only one running instance of VLC can sometimes be useful, " \ @@ -539,7 +617,7 @@ static char *ppsz_align_descriptions[] = { N_("Center"), #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 correctely implement condition variables. " \ + "allows us to correctly implement condition variables. " \ "You can also use the faster Win9x implementation but you might " \ "experience problems with it.") @@ -595,23 +673,27 @@ static char *ppsz_align_descriptions[] = { N_("Center"), #define JF5MIN_KEY_LONGTEXT N_("Select the hotkey to jump 5 minutes forward.") #define QUIT_KEY_TEXT N_("Quit") -#define QUIT_KEY_LONGTEXT N_("Select the hotkey to quit the applicatioN.") +#define QUIT_KEY_LONGTEXT N_("Select the hotkey to quit the application.") #define NAV_UP_KEY_TEXT N_("Navigate up") -#define NAV_UP_KEY_LONGTEXT N_("Select the key to move the selector up in dvd menus.") +#define NAV_UP_KEY_LONGTEXT N_("Select the key to move the selector up in DVD menus.") #define NAV_DOWN_KEY_TEXT N_("Navigate down") -#define NAV_DOWN_KEY_LONGTEXT N_("Select the key to move the selector down in dvd menus.") +#define NAV_DOWN_KEY_LONGTEXT N_("Select the key to move the selector down in DVD menus.") #define NAV_LEFT_KEY_TEXT N_("Navigate left") -#define NAV_LEFT_KEY_LONGTEXT N_("Select the key to move the selector left in dvd menus.") +#define NAV_LEFT_KEY_LONGTEXT N_("Select the key to move the selector left in DVD menus.") #define NAV_RIGHT_KEY_TEXT N_("Navigate right") -#define NAV_RIGHT_KEY_LONGTEXT N_("Select the key to move the selector right in dvd menus.") +#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 NAV_ACTIVATE_KEY_LONGTEXT N_("Select the key to activate selected item in DVD menus.") #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") #define VOL_DOWN_KEY_LONGTEXT N_("Select the key to decrease audio volume.") #define VOL_MUTE_KEY_TEXT N_("Mute") #define VOL_MUTE_KEY_LONGTEXT N_("Select the key to turn off audio volume.") +#define SUBDELAY_UP_KEY_TEXT N_("Subtitle delay up") +#define SUBDELAY_UP_KEY_LONGTEXT N_("Select the key to increase the subtitle delay.") +#define SUBDELAY_DOWN_KEY_TEXT N_("Subtitle delay down") +#define SUBDELAY_DOWN_KEY_LONGTEXT N_("Select the key to decrease the subtitle delay.") #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") @@ -635,16 +717,31 @@ static char *ppsz_align_descriptions[] = { N_("Center"), #define SET_BOOKMARK10_KEY_TEXT N_("Set playlist bookmark 10") #define SET_BOOKMARK_KEY_LONGTEXT N_("Select the key to set this playlist bookmark.") -#define PLAYLIST_USAGE N_("\nPlaylist items:" \ - "\n *.mpg, *.vob plain MPEG-1/2 files" \ - "\n [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]" \ - "\n DVD device" \ - "\n [vcd:][device][@[title][,[chapter]]" \ - "\n VCD device" \ - "\n udpstream:[@[][:]]" \ - "\n UDP stream sent by a streaming server" \ - "\n vlc:pause pause execution of " \ - "playlist items" \ +#define HISTORY_BACK_TEXT N_("Go back in browsing history") +#define HISTORY_BACK_LONGTEXT N_("Select the key to go back (to the previous media item) in the browsing history.") +#define HISTORY_FORWARD_TEXT N_("Go forward in browsing history") +#define HISTORY_FORWARD_LONGTEXT N_("Select the key to go forward (to the next media item) in the browsing history.") + +#define AUDIO_TRACK_KEY_TEXT N_("Cycle audio track") +#define AUDIO_TRACK_KEY_LONGTEXT N_("Cycle through the available audio tracks(languages)") +#define SUBTITLE_TRACK_KEY_TEXT N_("Cycle subtitle track") +#define SUBTITLE_TRACK_KEY_LONGTEXT N_("Cycle through the available subtitle tracks") + +#define PLAYLIST_USAGE N_( \ + "\nPlaylist MRL syntax:" \ + "\n URL[@[title][:chapter][-[title][:chapter]]] [:option=value]" \ + "\nURL syntax:" \ + "\n [file://]filename plain media file" \ + "\n http://ip:port/file HTTP URL" \ + "\n ftp://ip:port/file FTP URL" \ + "\n mms://ip:port/file MMS URL" \ + "\n screen:// Screen capture" \ + "\n [dvd://][device][@raw_device] DVD device" \ + "\n [vcd://][device] VCD device" \ + "\n [cdda://][device] Audio CD device" \ + "\n udp:[[]@[][:]]" \ + "\n UDP stream sent by a streaming server"\ + "\n vlc:pause pause execution of playlist items" \ "\n vlc:quit quit VLC" \ "\n") @@ -685,10 +782,6 @@ vlc_module_begin(); add_bool( "color", 0, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE ); add_bool( "advanced", 0, NULL, ADVANCED_TEXT, ADVANCED_LONGTEXT, VLC_FALSE ); - add_directory( "search-path", NULL, NULL, INTF_PATH_TEXT, - INTF_PATH_LONGTEXT, VLC_TRUE ); - add_directory( "plugin-path", NULL, NULL, - PLUGIN_PATH_TEXT, PLUGIN_PATH_LONGTEXT, VLC_TRUE ); /* Audio options */ add_category_hint( N_("Audio"), AOUT_CAT_LONGTEXT , VLC_FALSE ); @@ -722,6 +815,10 @@ vlc_module_begin(); add_bool( "video", 1, NULL, VIDEO_TEXT, VIDEO_LONGTEXT, VLC_TRUE ); add_integer( "width", -1, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, VLC_TRUE ); add_integer( "height", -1, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, VLC_TRUE ); + 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( "video-title", NULL, NULL, VIDEO_TITLE_TEXT, + VIDEO_TITLE_LONGTEXT, VLC_TRUE ); add_integer( "align", 0, NULL, ALIGN_TEXT, ALIGN_LONGTEXT, VLC_TRUE ); change_integer_list( pi_align_values, ppsz_align_descriptions, 0 ); add_float( "zoom", 1, NULL, ZOOM_TEXT, ZOOM_LONGTEXT, VLC_TRUE ); @@ -765,19 +862,56 @@ vlc_module_begin(); SUB_AUTO_TEXT, SUB_AUTO_LONGTEXT, VLC_FALSE ); add_integer( "sub-autodetect-fuzzy", 3, NULL, SUB_FUZZY_TEXT, SUB_FUZZY_LONGTEXT, VLC_TRUE ); +#ifdef WIN32 +# define SUB_PATH ".\\subtitles" +#else +# define SUB_PATH "./Subtitles, ./subtitles" +#endif + add_string( "sub-autodetect-path", SUB_PATH, NULL, + SUB_PATH_TEXT, SUB_PATH_LONGTEXT, VLC_TRUE ); add_file( "sub-file", NULL, NULL, SUB_FILE_TEXT, SUB_FILE_LONGTEXT, VLC_TRUE ); - - - add_file( "dvd", DVD_DEVICE, NULL, DVD_DEV_TEXT, DVD_DEV_LONGTEXT, VLC_FALSE ); - add_file( "vcd", VCD_DEVICE, NULL, VCD_DEV_TEXT, VCD_DEV_LONGTEXT, VLC_FALSE ); - add_file( "cd-audio", CDAUDIO_DEVICE, NULL, CDAUDIO_DEV_TEXT, CDAUDIO_DEV_LONGTEXT, VLC_FALSE ); + add_integer( "input-repeat", 0, NULL, + INPUT_REPEAT_TEXT, INPUT_REPEAT_LONGTEXT, VLC_TRUE ); + add_integer( "start-time", 0, NULL, + START_TIME_TEXT, START_TIME_LONGTEXT, VLC_TRUE ); + add_integer( "stop-time", 0, NULL, + STOP_TIME_TEXT, STOP_TIME_LONGTEXT, VLC_TRUE ); + add_string( "input-slave", NULL, NULL, + INPUT_SLAVE_TEXT, INPUT_SLAVE_LONGTEXT, VLC_TRUE ); + + add_string( "bookmarks", NULL, NULL, + BOOKMARKS_TEXT, BOOKMARKS_LONGTEXT, VLC_TRUE ); + + add_file( "dvd", DVD_DEVICE, NULL, DVD_DEV_TEXT, DVD_DEV_LONGTEXT, + VLC_FALSE ); + add_file( "vcd", VCD_DEVICE, NULL, VCD_DEV_TEXT, VCD_DEV_LONGTEXT, + VLC_FALSE ); + add_file( "cd-audio", CDAUDIO_DEVICE, NULL, CDAUDIO_DEV_TEXT, + CDAUDIO_DEV_LONGTEXT, VLC_FALSE ); 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 ); change_short('4'); + add_string( "meta-title", NULL, NULL, META_TITLE_TEXT, + META_TITLE_LONGTEXT, VLC_TRUE ); + add_string( "meta-author", NULL, NULL, META_AUTHOR_TEXT, + META_AUTHOR_LONGTEXT, VLC_TRUE ); + add_string( "meta-artist", NULL, NULL, META_ARTIST_TEXT, + META_ARTIST_LONGTEXT, VLC_TRUE ); + add_string( "meta-genre", NULL, NULL, META_GENRE_TEXT, + META_GENRE_LONGTEXT, VLC_TRUE ); + add_string( "meta-copyright", NULL, NULL, META_CPYR_TEXT, + META_CPYR_LONGTEXT, VLC_TRUE ); + add_string( "meta-description", NULL, NULL, META_DESCR_TEXT, + META_DESCR_LONGTEXT, VLC_TRUE ); + add_string( "meta-date", NULL, NULL, META_DATE_TEXT, + META_DATE_LONGTEXT, VLC_TRUE ); + add_string( "meta-url", NULL, NULL, META_URL_TEXT, + META_URL_LONGTEXT, VLC_TRUE ); + /* Decoder options */ add_category_hint( N_("Decoders"), CODEC_CAT_LONGTEXT , VLC_TRUE ); add_module( "codec", "decoder", NULL, NULL, CODEC_TEXT, CODEC_LONGTEXT, VLC_TRUE ); @@ -806,6 +940,10 @@ vlc_module_begin(); ACCESS_OUTPUT_TEXT, ACCESS_OUTPUT_LONGTEXT, VLC_TRUE ); add_integer( "ttl", 1, NULL, TTL_TEXT, TTL_LONGTEXT, VLC_TRUE ); + add_bool( "sap-flow-control", VLC_FALSE, NULL, ANN_SAPCTRL_TEXT, + ANN_SAPCTRL_LONGTEXT, VLC_TRUE ); + add_integer( "sap-interval", 5, NULL, ANN_SAPINTV_TEXT, + ANN_SAPINTV_LONGTEXT, VLC_TRUE ); /* CPU options */ add_category_hint( N_("CPU"), CPU_CAT_LONGTEXT, VLC_TRUE ); @@ -814,6 +952,7 @@ vlc_module_begin(); add_bool( "3dn", 1, NULL, THREE_DN_TEXT, THREE_DN_LONGTEXT, VLC_TRUE ); add_bool( "mmxext", 1, NULL, MMXEXT_TEXT, MMXEXT_LONGTEXT, VLC_TRUE ); add_bool( "sse", 1, NULL, SSE_TEXT, SSE_LONGTEXT, VLC_TRUE ); + add_bool( "sse2", 1, NULL, SSE2_TEXT, SSE2_LONGTEXT, VLC_TRUE ); #endif #if defined( __powerpc__ ) || defined( SYS_DARWIN ) add_bool( "altivec", 1, NULL, ALTIVEC_TEXT, ALTIVEC_LONGTEXT, VLC_TRUE ); @@ -827,122 +966,267 @@ vlc_module_begin(); change_short('L'); add_bool( "repeat", 0, NULL, REPEAT_TEXT, REPEAT_LONGTEXT, VLC_TRUE ); change_short('R'); + add_bool( "play-and-stop", 0, NULL, PAS_TEXT, PAS_LONGTEXT, VLC_TRUE ); /* Misc options */ add_category_hint( N_("Miscellaneous"), MISC_CAT_LONGTEXT, VLC_TRUE ); - add_module( "memcpy", "memcpy", NULL, NULL, MEMCPY_TEXT, MEMCPY_LONGTEXT, VLC_TRUE ); - add_module( "access", "access", NULL, NULL, ACCESS_TEXT, ACCESS_LONGTEXT, VLC_TRUE ); - add_module( "demux", "demux", NULL, NULL, DEMUX_TEXT, DEMUX_LONGTEXT, VLC_TRUE ); - - add_bool( "minimize-threads", 0, NULL, MINIMIZE_THREADS_TXT, MINIMIZE_THREADS_LONGTXT, VLC_TRUE ); + add_module( "memcpy", "memcpy", NULL, NULL, MEMCPY_TEXT, + MEMCPY_LONGTEXT, VLC_TRUE ); + add_module( "access", "access", NULL, NULL, ACCESS_TEXT, + ACCESS_LONGTEXT, VLC_TRUE ); + add_module( "demux", "demux", NULL, NULL, DEMUX_TEXT, + DEMUX_LONGTEXT, VLC_TRUE ); + add_bool( "minimize-threads", 0, NULL, MINIMIZE_THREADS_TEXT, + MINIMIZE_THREADS_LONGTEXT, VLC_TRUE ); + add_bool( "plugins-cache", 0, NULL, PLUGINS_CACHE_TEXT, + PLUGINS_CACHE_LONGTEXT, VLC_TRUE ); + add_directory( "plugin-path", NULL, NULL, PLUGIN_PATH_TEXT, + PLUGIN_PATH_LONGTEXT, VLC_TRUE ); + +#if !defined(WIN32) + add_bool( "daemon", 0, NULL, DAEMON_TEXT, DAEMON_LONGTEXT, VLC_TRUE ); + change_short('d'); +#endif #if !defined(SYS_DARWIN) && !defined(SYS_BEOS) && defined(PTHREAD_COND_T_IN_PTHREAD_H) - add_bool( "rt-priority", 0, NULL, RT_PRIORITY_TEXT, RT_PRIORITY_LONGTEXT, VLC_TRUE ); + add_bool( "rt-priority", 0, NULL, RT_PRIORITY_TEXT, + RT_PRIORITY_LONGTEXT, VLC_TRUE ); +#endif + +#if !defined(SYS_BEOS) && defined(PTHREAD_COND_T_IN_PTHREAD_H) + add_integer( "rt-offset", 0, NULL, RT_OFFSET_TEXT, + RT_OFFSET_LONGTEXT, VLC_TRUE ); #endif #if defined(WIN32) - add_bool( "one-instance", 0, NULL, ONEINSTANCE_TEXT, ONEINSTANCE_LONGTEXT, VLC_TRUE ); - add_bool( "high-priority", 1, NULL, HPRIORITY_TEXT, HPRIORITY_LONGTEXT, VLC_TRUE ); - add_bool( "fast-mutex", 0, NULL, FAST_MUTEX_TEXT, FAST_MUTEX_LONGTEXT, VLC_TRUE ); - add_integer( "win9x-cv-method", 1, NULL, WIN9X_CV_TEXT, WIN9X_CV_LONGTEXT, VLC_TRUE ); + add_bool( "one-instance", 0, NULL, ONEINSTANCE_TEXT, + ONEINSTANCE_LONGTEXT, VLC_TRUE ); + add_bool( "high-priority", 0, NULL, HPRIORITY_TEXT, + HPRIORITY_LONGTEXT, VLC_TRUE ); + add_bool( "fast-mutex", 0, NULL, FAST_MUTEX_TEXT, + FAST_MUTEX_LONGTEXT, VLC_TRUE ); + add_integer( "win9x-cv-method", 1, NULL, WIN9X_CV_TEXT, + WIN9X_CV_LONGTEXT, VLC_TRUE ); #endif /* Hotkey options*/ add_category_hint( N_("Hot keys"), HOTKEY_CAT_LONGTEXT , VLC_FALSE ); + #if defined(SYS_DARWIN) - add_key( "key-fullscreen", KEY_MODIFIER_COMMAND|'f', NULL, FULLSCREEN_KEY_TEXT, FULLSCREEN_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-play-pause", KEY_MODIFIER_COMMAND|'p', NULL, PLAY_PAUSE_KEY_TEXT, PLAY_PAUSE_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-pause", 0, NULL, PAUSE_KEY_TEXT, PAUSE_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-play", 0, NULL, PLAY_KEY_TEXT, PLAY_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-faster", KEY_MODIFIER_COMMAND|'=', NULL, FASTER_KEY_TEXT, FASTER_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-slower", KEY_MODIFIER_COMMAND|'-', NULL, SLOWER_KEY_TEXT, SLOWER_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-next", KEY_MODIFIER_COMMAND|KEY_RIGHT, NULL, NEXT_KEY_TEXT, NEXT_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-prev", KEY_MODIFIER_COMMAND|KEY_LEFT, NULL, PREV_KEY_TEXT, PREV_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-stop", KEY_MODIFIER_COMMAND|'.', NULL, STOP_KEY_TEXT, STOP_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-position", 't', NULL, POSITION_KEY_TEXT, POSITION_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-jump-10sec", KEY_MODIFIER_COMMAND|KEY_MODIFIER_ALT|KEY_LEFT, NULL, JB10SEC_KEY_TEXT, JB10SEC_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-jump+10sec", KEY_MODIFIER_COMMAND|KEY_MODIFIER_ALT|KEY_RIGHT, NULL, JF10SEC_KEY_TEXT, JF10SEC_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-jump-1min", KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|KEY_LEFT, NULL, JB1MIN_KEY_TEXT, JB1MIN_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-jump+1min", KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|KEY_RIGHT, NULL, JF1MIN_KEY_TEXT, JF1MIN_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-jump-5min", KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|KEY_MODIFIER_ALT|KEY_LEFT, NULL, JB5MIN_KEY_TEXT, JB5MIN_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-jump+5min", KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|KEY_MODIFIER_ALT|KEY_RIGHT, NULL, JF5MIN_KEY_TEXT, JF5MIN_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-nav-activate", KEY_ENTER, NULL, NAV_ACTIVATE_KEY_TEXT, NAV_ACTIVATE_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-nav-up", KEY_UP, NULL, NAV_UP_KEY_TEXT, NAV_UP_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-nav-down", KEY_DOWN, NULL, NAV_DOWN_KEY_TEXT, NAV_DOWN_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-nav-left", KEY_LEFT, NULL, NAV_LEFT_KEY_TEXT, NAV_LEFT_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-nav-right", KEY_RIGHT, NULL, NAV_RIGHT_KEY_TEXT, NAV_RIGHT_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-quit", KEY_MODIFIER_COMMAND|'q', NULL, QUIT_KEY_TEXT, QUIT_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-vol-up", KEY_MODIFIER_COMMAND|KEY_UP, NULL, VOL_UP_KEY_TEXT, VOL_UP_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-vol-down", KEY_MODIFIER_COMMAND|KEY_DOWN, NULL, VOL_DOWN_KEY_TEXT, VOL_DOWN_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-vol-mute", KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'m', NULL, VOL_MUTE_KEY_TEXT, VOL_MUTE_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-set-bookmark1", KEY_MODIFIER_COMMAND|KEY_F1, NULL, SET_BOOKMARK1_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-set-bookmark2", KEY_MODIFIER_COMMAND|KEY_F2, NULL, SET_BOOKMARK2_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-set-bookmark3", KEY_MODIFIER_COMMAND|KEY_F3, NULL, SET_BOOKMARK3_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-set-bookmark4", KEY_MODIFIER_COMMAND|KEY_F4, NULL, SET_BOOKMARK4_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-set-bookmark5", KEY_MODIFIER_COMMAND|KEY_F5, NULL, SET_BOOKMARK5_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-set-bookmark6", KEY_MODIFIER_COMMAND|KEY_F6, NULL, SET_BOOKMARK6_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-set-bookmark7", KEY_MODIFIER_COMMAND|KEY_F7, NULL, SET_BOOKMARK7_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-set-bookmark8", KEY_MODIFIER_COMMAND|KEY_F8, NULL, SET_BOOKMARK8_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-set-bookmark9", KEY_UNSET, NULL, SET_BOOKMARK9_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-set-bookmark10", KEY_UNSET, NULL, SET_BOOKMARK10_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-play-bookmark1", KEY_F1, NULL, PLAY_BOOKMARK1_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-play-bookmark2", KEY_F2, NULL, PLAY_BOOKMARK2_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-play-bookmark3", KEY_F3, NULL, PLAY_BOOKMARK3_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-play-bookmark4", KEY_F4, NULL, PLAY_BOOKMARK4_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-play-bookmark5", KEY_F5, NULL, PLAY_BOOKMARK5_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-play-bookmark6", KEY_F6, NULL, PLAY_BOOKMARK6_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-play-bookmark7", KEY_F7, NULL, PLAY_BOOKMARK7_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-play-bookmark8", KEY_F8, NULL, PLAY_BOOKMARK8_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-play-bookmark9", KEY_UNSET, NULL, PLAY_BOOKMARK9_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-play-bookmark10", KEY_UNSET, NULL, PLAY_BOOKMARK10_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); +# define KEY_FULLSCREEN KEY_MODIFIER_COMMAND|'f' +# define KEY_PLAY_PAUSE KEY_MODIFIER_COMMAND|'p' +# define KEY_PAUSE KEY_UNSET +# define KEY_PLAY KEY_UNSET +# define KEY_FASTER KEY_MODIFIER_COMMAND|'=' +# define KEY_SLOWER KEY_MODIFIER_COMMAND|'-' +# define KEY_NEXT KEY_MODIFIER_COMMAND|KEY_RIGHT +# define KEY_PREV KEY_MODIFIER_COMMAND|KEY_LEFT +# define KEY_STOP KEY_MODIFIER_COMMAND|'.' +# define KEY_POSITION 't' +# 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 +# define KEY_JUMP_P1MIN KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|KEY_RIGHT +# define KEY_JUMP_M5MIN KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|KEY_MODIFIER_ALT|KEY_LEFT +# define KEY_JUMP_P5MIN KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|KEY_MODIFIER_ALT|KEY_RIGHT +# define KEY_NAV_ACTIVATE KEY_ENTER +# define KEY_NAV_UP KEY_UP +# define KEY_NAV_DOWN KEY_DOWN +# define KEY_NAV_LEFT KEY_LEFT +# define KEY_NAV_RIGHT KEY_RIGHT +# 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_SUBDELAY_UP KEY_MODIFIER_COMMAND|'k' +# define KEY_SUBDELAY_DOWN KEY_MODIFIER_COMMAND|'j' +# define KEY_AUDIO_TRACK 'l' +# define KEY_SUBTITLE_TRACK 's' + +# 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_SET_BOOKMARK4 KEY_MODIFIER_COMMAND|KEY_F4 +# define KEY_SET_BOOKMARK5 KEY_MODIFIER_COMMAND|KEY_F5 +# define KEY_SET_BOOKMARK6 KEY_MODIFIER_COMMAND|KEY_F6 +# define KEY_SET_BOOKMARK7 KEY_MODIFIER_COMMAND|KEY_F7 +# define KEY_SET_BOOKMARK8 KEY_MODIFIER_COMMAND|KEY_F8 +# define KEY_SET_BOOKMARK9 KEY_UNSET +# define KEY_SET_BOOKMARK10 KEY_UNSET +# define KEY_PLAY_BOOKMARK1 KEY_F1 +# define KEY_PLAY_BOOKMARK2 KEY_F2 +# define KEY_PLAY_BOOKMARK3 KEY_F3 +# define KEY_PLAY_BOOKMARK4 KEY_F4 +# define KEY_PLAY_BOOKMARK5 KEY_F5 +# define KEY_PLAY_BOOKMARK6 KEY_F6 +# define KEY_PLAY_BOOKMARK7 KEY_F7 +# define KEY_PLAY_BOOKMARK8 KEY_F8 +# define KEY_PLAY_BOOKMARK9 KEY_UNSET +# define KEY_PLAY_BOOKMARK10 KEY_UNSET +# define KEY_HISTORY_BACK KEY_MODIFIER_COMMAND|'[' +# define KEY_HISTORY_FORWARD KEY_MODIFIER_COMMAND|']' + #else - add_key( "key-fullscreen", 'f', NULL, FULLSCREEN_KEY_TEXT, FULLSCREEN_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-play-pause", KEY_SPACE, NULL, PLAY_PAUSE_KEY_TEXT, PLAY_PAUSE_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-pause", 0, NULL, PAUSE_KEY_TEXT, PAUSE_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-play", 0, NULL, PLAY_KEY_TEXT, PLAY_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-faster", '+', NULL, FASTER_KEY_TEXT, FASTER_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-slower", '-', NULL, SLOWER_KEY_TEXT, SLOWER_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-next", 'n', NULL, NEXT_KEY_TEXT, NEXT_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-prev", 'p', NULL, PREV_KEY_TEXT, PREV_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-stop", 's', NULL, STOP_KEY_TEXT, STOP_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-position", 't', NULL, POSITION_KEY_TEXT, POSITION_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-jump-10sec", KEY_MODIFIER_ALT|KEY_LEFT, NULL, JB10SEC_KEY_TEXT, JB10SEC_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-jump+10sec", KEY_MODIFIER_ALT|KEY_RIGHT, NULL, JF10SEC_KEY_TEXT, JF10SEC_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-jump-1min", KEY_MODIFIER_CTRL|KEY_LEFT, NULL, JB1MIN_KEY_TEXT, JB1MIN_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-jump+1min", KEY_MODIFIER_CTRL|KEY_RIGHT, NULL, JF1MIN_KEY_TEXT, JF1MIN_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-jump-5min", KEY_MODIFIER_CTRL|KEY_MODIFIER_ALT|KEY_LEFT, NULL, JB5MIN_KEY_TEXT, JB5MIN_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-jump+5min", KEY_MODIFIER_CTRL|KEY_MODIFIER_ALT|KEY_RIGHT, NULL, JF5MIN_KEY_TEXT, JF5MIN_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-nav-activate", KEY_ENTER, NULL, NAV_ACTIVATE_KEY_TEXT, NAV_ACTIVATE_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-nav-up", KEY_UP, NULL, NAV_UP_KEY_TEXT, NAV_UP_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-nav-down", KEY_DOWN, NULL, NAV_DOWN_KEY_TEXT, NAV_DOWN_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-nav-left", KEY_LEFT, NULL, NAV_LEFT_KEY_TEXT, NAV_LEFT_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-nav-right", KEY_RIGHT, NULL, NAV_RIGHT_KEY_TEXT, NAV_RIGHT_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-quit", KEY_MODIFIER_CTRL|'q', NULL, QUIT_KEY_TEXT, QUIT_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-vol-up", 'a', NULL, VOL_UP_KEY_TEXT, VOL_UP_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-vol-down", 'z', NULL, VOL_DOWN_KEY_TEXT, VOL_DOWN_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-vol-mute", 'm', NULL, VOL_MUTE_KEY_TEXT, VOL_MUTE_KEY_LONGTEXT, VLC_FALSE ); - add_key( "key-set-bookmark1", KEY_MODIFIER_CTRL|KEY_F1, NULL, SET_BOOKMARK1_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-set-bookmark2", KEY_MODIFIER_CTRL|KEY_F2, NULL, SET_BOOKMARK2_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-set-bookmark3", KEY_MODIFIER_CTRL|KEY_F3, NULL, SET_BOOKMARK3_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-set-bookmark4", KEY_MODIFIER_CTRL|KEY_F4, NULL, SET_BOOKMARK4_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-set-bookmark5", KEY_MODIFIER_CTRL|KEY_F5, NULL, SET_BOOKMARK5_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-set-bookmark6", KEY_MODIFIER_CTRL|KEY_F6, NULL, SET_BOOKMARK6_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-set-bookmark7", KEY_MODIFIER_CTRL|KEY_F7, NULL, SET_BOOKMARK7_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-set-bookmark8", KEY_MODIFIER_CTRL|KEY_F8, NULL, SET_BOOKMARK8_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-set-bookmark9", KEY_MODIFIER_CTRL|KEY_F9, NULL, SET_BOOKMARK9_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-set-bookmark10", KEY_MODIFIER_CTRL|KEY_F10, NULL, SET_BOOKMARK10_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-play-bookmark1", KEY_F1, NULL, PLAY_BOOKMARK1_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-play-bookmark2", KEY_F2, NULL, PLAY_BOOKMARK2_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-play-bookmark3", KEY_F3, NULL, PLAY_BOOKMARK3_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-play-bookmark4", KEY_F4, NULL, PLAY_BOOKMARK4_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-play-bookmark5", KEY_F5, NULL, PLAY_BOOKMARK5_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-play-bookmark6", KEY_F6, NULL, PLAY_BOOKMARK6_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-play-bookmark7", KEY_F7, NULL, PLAY_BOOKMARK7_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-play-bookmark8", KEY_F8, NULL, PLAY_BOOKMARK8_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-play-bookmark9", KEY_F9, NULL, PLAY_BOOKMARK9_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); - add_key( "key-play-bookmark10", KEY_F10, NULL, PLAY_BOOKMARK10_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); +# define KEY_FULLSCREEN 'f' +# define KEY_PLAY_PAUSE KEY_SPACE +# define KEY_PAUSE KEY_UNSET +# define KEY_PLAY KEY_UNSET +# define KEY_FASTER '+' +# define KEY_SLOWER '-' +# define KEY_NEXT 'n' +# define KEY_PREV 'p' +# define KEY_STOP 's' +# define KEY_POSITION 't' +# 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 +# define KEY_JUMP_P1MIN KEY_MODIFIER_CTRL|KEY_RIGHT +# define KEY_JUMP_M5MIN KEY_MODIFIER_CTRL|KEY_MODIFIER_ALT|KEY_LEFT +# define KEY_JUMP_P5MIN KEY_MODIFIER_CTRL|KEY_MODIFIER_ALT|KEY_RIGHT +# define KEY_NAV_ACTIVATE KEY_ENTER +# define KEY_NAV_UP KEY_UP +# define KEY_NAV_DOWN KEY_DOWN +# define KEY_NAV_LEFT KEY_LEFT +# define KEY_NAV_RIGHT KEY_RIGHT +# define KEY_QUIT KEY_MODIFIER_CTRL|'q' +# 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_COMMAND|'h' +# define KEY_SUBDELAY_DOWN KEY_MODIFIER_COMMAND|'j' +# define KEY_AUDIO_TRACK 'l' +# define KEY_SUBTITLE_TRACK 'k' + +# 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 +# define KEY_SET_BOOKMARK4 KEY_MODIFIER_CTRL|KEY_F4 +# define KEY_SET_BOOKMARK5 KEY_MODIFIER_CTRL|KEY_F5 +# define KEY_SET_BOOKMARK6 KEY_MODIFIER_CTRL|KEY_F6 +# define KEY_SET_BOOKMARK7 KEY_MODIFIER_CTRL|KEY_F7 +# define KEY_SET_BOOKMARK8 KEY_MODIFIER_CTRL|KEY_F8 +# define KEY_SET_BOOKMARK9 KEY_MODIFIER_CTRL|KEY_F9 +# define KEY_SET_BOOKMARK10 KEY_MODIFIER_CTRL|KEY_F10 +# define KEY_PLAY_BOOKMARK1 KEY_F1 +# define KEY_PLAY_BOOKMARK2 KEY_F2 +# define KEY_PLAY_BOOKMARK3 KEY_F3 +# define KEY_PLAY_BOOKMARK4 KEY_F4 +# define KEY_PLAY_BOOKMARK5 KEY_F5 +# define KEY_PLAY_BOOKMARK6 KEY_F6 +# define KEY_PLAY_BOOKMARK7 KEY_F7 +# 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|'[' +# define KEY_HISTORY_FORWARD KEY_MODIFIER_CTRL|']' #endif + add_key( "key-fullscreen", KEY_FULLSCREEN, NULL, FULLSCREEN_KEY_TEXT, + 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, + PAUSE_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-play", KEY_PLAY, NULL, PLAY_KEY_TEXT, + PLAY_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-faster", KEY_FASTER, NULL, FASTER_KEY_TEXT, + FASTER_KEY_LONGTEXT, VLC_FALSE ); + add_key( "key-slower", KEY_SLOWER, NULL, SLOWER_KEY_TEXT, + SLOWER_KEY_LONGTEXT, VLC_FALSE ); + add_key( "key-next", KEY_NEXT, NULL, NEXT_KEY_TEXT, + NEXT_KEY_LONGTEXT, VLC_FALSE ); + add_key( "key-prev", KEY_PREV, NULL, PREV_KEY_TEXT, + PREV_KEY_LONGTEXT, VLC_FALSE ); + add_key( "key-stop", KEY_STOP, NULL, STOP_KEY_TEXT, + STOP_KEY_LONGTEXT, VLC_FALSE ); + add_key( "key-position", KEY_POSITION, NULL, POSITION_KEY_TEXT, + POSITION_KEY_LONGTEXT, VLC_TRUE ); + 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, + JF10SEC_KEY_LONGTEXT, VLC_FALSE ); + add_key( "key-jump-1min", KEY_JUMP_M1MIN, NULL, JB1MIN_KEY_TEXT, + JB1MIN_KEY_LONGTEXT, VLC_FALSE ); + add_key( "key-jump+1min", KEY_JUMP_P1MIN, NULL, JF1MIN_KEY_TEXT, + JF1MIN_KEY_LONGTEXT, VLC_FALSE ); + add_key( "key-jump-5min", KEY_JUMP_M5MIN, NULL, JB5MIN_KEY_TEXT, + JB5MIN_KEY_LONGTEXT, VLC_FALSE ); + add_key( "key-jump+5min", KEY_JUMP_P5MIN, NULL, JF5MIN_KEY_TEXT, + JF5MIN_KEY_LONGTEXT, VLC_FALSE ); + + add_key( "key-nav-activate", KEY_NAV_ACTIVATE, NULL, NAV_ACTIVATE_KEY_TEXT, + NAV_ACTIVATE_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-nav-up", KEY_NAV_UP, NULL, NAV_UP_KEY_TEXT, + NAV_UP_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-nav-down", KEY_NAV_DOWN, NULL, NAV_DOWN_KEY_TEXT, + NAV_DOWN_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-nav-left", KEY_NAV_LEFT, NULL, NAV_LEFT_KEY_TEXT, + NAV_LEFT_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-nav-right", KEY_NAV_RIGHT, NULL, NAV_RIGHT_KEY_TEXT, + NAV_RIGHT_KEY_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, + VOL_UP_KEY_LONGTEXT, VLC_FALSE ); + add_key( "key-vol-down", KEY_VOL_DOWN, NULL, VOL_DOWN_KEY_TEXT, + VOL_DOWN_KEY_LONGTEXT, VLC_FALSE ); + add_key( "key-vol-mute", KEY_VOL_MUTE, NULL, VOL_MUTE_KEY_TEXT, + VOL_MUTE_KEY_LONGTEXT, VLC_FALSE ); + add_key( "key-subdelay-up", KEY_SUBDELAY_UP, NULL, + SUBDELAY_UP_KEY_TEXT, SUBDELAY_UP_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-subdelay-down", KEY_SUBDELAY_DOWN, NULL, + SUBDELAY_DOWN_KEY_TEXT, SUBDELAY_DOWN_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-audio-track", KEY_AUDIO_TRACK, NULL, AUDIO_TRACK_KEY_TEXT, + AUDIO_TRACK_KEY_LONGTEXT, VLC_FALSE ); + add_key( "key-subtitle-track", KEY_SUBTITLE_TRACK, NULL, + SUBTITLE_TRACK_KEY_TEXT, SUBTITLE_TRACK_KEY_LONGTEXT, VLC_FALSE ); + + add_key( "key-set-bookmark1", KEY_SET_BOOKMARK1, NULL, + SET_BOOKMARK1_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-set-bookmark2", KEY_SET_BOOKMARK2, NULL, + SET_BOOKMARK2_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-set-bookmark3", KEY_SET_BOOKMARK3, NULL, + SET_BOOKMARK3_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-set-bookmark4", KEY_SET_BOOKMARK4, NULL, + SET_BOOKMARK4_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-set-bookmark5", KEY_SET_BOOKMARK5, NULL, + SET_BOOKMARK5_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-set-bookmark6", KEY_SET_BOOKMARK6, NULL, + SET_BOOKMARK6_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-set-bookmark7", KEY_SET_BOOKMARK7, NULL, + SET_BOOKMARK7_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-set-bookmark8", KEY_SET_BOOKMARK8, NULL, + SET_BOOKMARK8_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-set-bookmark9", KEY_SET_BOOKMARK9, NULL, + SET_BOOKMARK9_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-set-bookmark10", KEY_SET_BOOKMARK10, NULL, + SET_BOOKMARK10_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-play-bookmark1", KEY_PLAY_BOOKMARK1, NULL, + PLAY_BOOKMARK1_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-play-bookmark2", KEY_PLAY_BOOKMARK2, NULL, + PLAY_BOOKMARK2_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-play-bookmark3", KEY_PLAY_BOOKMARK3, NULL, + PLAY_BOOKMARK3_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-play-bookmark4", KEY_PLAY_BOOKMARK4, NULL, + PLAY_BOOKMARK4_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-play-bookmark5", KEY_PLAY_BOOKMARK5, NULL, + PLAY_BOOKMARK5_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-play-bookmark6", KEY_PLAY_BOOKMARK6, NULL, + PLAY_BOOKMARK6_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-play-bookmark7", KEY_PLAY_BOOKMARK7, NULL, + PLAY_BOOKMARK7_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-play-bookmark8", KEY_PLAY_BOOKMARK8, NULL, + PLAY_BOOKMARK8_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-play-bookmark9", KEY_PLAY_BOOKMARK9, NULL, + PLAY_BOOKMARK9_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-play-bookmark10", KEY_PLAY_BOOKMARK10, NULL, + PLAY_BOOKMARK10_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-history-back", KEY_HISTORY_BACK, NULL, HISTORY_BACK_TEXT, + HISTORY_BACK_LONGTEXT, VLC_TRUE ); + add_key( "key-history-forward", KEY_HISTORY_FORWARD, NULL, + HISTORY_FORWARD_TEXT, HISTORY_FORWARD_LONGTEXT, VLC_TRUE ); + /* Usage (mainly useful for cmd line stuff) */ add_usage_hint( PLAYLIST_USAGE ); @@ -966,6 +1250,8 @@ static module_config_t p_help_config[] = N_("reset the current config to the default values") }, { CONFIG_ITEM_STRING, NULL, "config", '\0', N_("use alternate config file") }, + { CONFIG_ITEM_BOOL, NULL, "reset-plugins-cache", '\0', + N_("resets the current plugins cache") }, { CONFIG_ITEM_BOOL, NULL, "version", '\0', N_("print version information") }, { CONFIG_HINT_END, NULL, NULL, '\0', NULL } @@ -1000,6 +1286,10 @@ static struct hotkey p_hotkeys[] = { "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-audio-track", ACTIONID_AUDIO_TRACK, 0}, + { "key-subtitle-track", ACTIONID_SUBTITLE_TRACK, 0}, { "key-nav-activate", ACTIONID_NAV_ACTIVATE, 0 }, { "key-nav-up", ACTIONID_NAV_UP, 0 }, { "key-nav-down", ACTIONID_NAV_DOWN, 0 }, @@ -1025,5 +1315,8 @@ static struct hotkey p_hotkeys[] = { "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}, { NULL, 0, 0 } }; +