X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.h;h=56f23d820af9ab50107ee60093520f963f25813c;hb=2a937a32600b44bde6a2143ace54484a86b41594;hp=f03e819dff7fb9050b1ecf72f81c02daa20fbe7f;hpb=44bc88f363c914cad96faeeb987d30b1ad64671a;p=vlc diff --git a/src/libvlc.h b/src/libvlc.h index f03e819dff..56f23d820a 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -1,12 +1,12 @@ /***************************************************************************** * libvlc.h: main libvlc header ***************************************************************************** - * Copyright (C) 1998-2002 VideoLAN + * Copyright (C) 1998-2005 VideoLAN * $Id$ * * Authors: Vincent Seguin * Samuel Hocevar - * Gildas Bazin + * Gildas Bazin * * 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 +27,16 @@ #include "vlc_keys.h" static char *ppsz_language[] = -{ "auto", "en", "en_GB", "es", "de", - "fr", "hu", "it", "ja", "nl", "no", - "pl", "pt_BR", "ru", "sv" }; +{ "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" }; 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_("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") }; + +static char *ppsz_snap_formats[] = +{ "png", "jpg" }; /***************************************************************************** * Configuration options for the main program. Each module will also separatly @@ -58,7 +61,11 @@ 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 CONTROL_TEXT N_("Control interfaces") +#define CONTROL_LONGTEXT N_( \ + "This option allows you to select control interfaces. " ) #define VERBOSE_TEXT N_("Verbosity (0,1,2)") #define VERBOSE_LONGTEXT N_( \ @@ -85,20 +92,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, etc.).\n" \ "Enable these filters here, and configure them in the \"audio filters\" " \ "modules section.") @@ -157,27 +154,24 @@ 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 " \ - "the sound, or audio visualization modules (spectrum analyzer, ...).") + "This allows you to add audio post processing filters, to modify " \ + "the sound" ) -#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_VISUAL_TEXT N_("Audio visualizations ") +#define AUDIO_VISUAL_LONGTEXT N_( \ + "This allows you to add visualization modules " \ + "(spectrum analyzer, etc.).") +#define AUDIO_CHANNEL_MIXER N_("Channel mixer") #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, ...). Enable these filters here and configure " \ + "These options allow you to modify the behavior of the video output " \ + "subsystem. You can for example enable video filters (deinterlacing, " \ + "image adjusting, etc.). Enable these filters here and configure " \ "them in the \"video filters\" modules section. You can also set many " \ "miscellaneous video options." ) @@ -202,17 +196,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_( \ @@ -237,15 +243,10 @@ static char *ppsz_align_descriptions[] = { N_("Center"), #define VIDEO_ON_TOP_LONGTEXT N_("Always place the video window on top of " \ "other windows." ) -#define SPUMARGIN_TEXT N_("Force SPU position") -#define SPUMARGIN_LONGTEXT N_( \ - "You can use this option to place the subtitles under the movie, " \ - "instead of over the movie. Try several positions.") - -#define OSD_TEXT N_("On Screen Display") -#define OSD_LONGTEXT N_( \ - "VLC can display messages on the video. This is called OSD (On Screen " \ - "Display). You can disable this feature here.") +#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.") #define FILTER_TEXT N_("Video filter module") #define FILTER_LONGTEXT N_( \ @@ -253,6 +254,16 @@ static char *ppsz_align_descriptions[] = { N_("Center"), "picture quality, for instance deinterlacing, or to clone or distort " \ "the video window.") +#define SNAP_PATH_TEXT N_("Video snapshot directory") +#define SNAP_PATH_LONGTEXT N_( \ + "Allows you to specify the directory where the video snapshots will " \ + "be stored.") + +#define SNAP_FORMAT_TEXT N_("Video snapshot format") +#define SNAP_FORMAT_LONGTEXT N_( \ + "Allows you to specify the image format in which the video snapshots will " \ + "be stored.") + #define ASPECT_RATIO_TEXT N_("Source aspect ratio") #define ASPECT_RATIO_LONGTEXT N_( \ "This will force the source aspect ratio. For instance, some DVDs claim " \ @@ -262,18 +273,17 @@ 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 SKIP_FRAMES_TEXT N_("Skip frames") +#define SKIP_FRAMES_LONGTEXT N_( \ + "Disable this option to disable frame drops on MPEG-2 streams.") + +#define QUIET_SYNCHRO_TEXT N_("Quiet synchro") +#define QUIET_SYNCHRO_LONGTEXT N_( \ + "Enable this option to avoid flooding the message log with debug " \ + "output from the video output synchro.") #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.") @@ -282,7 +292,15 @@ static char *ppsz_align_descriptions[] = { N_("Center"), "When using the PVR input (or a very irregular source), you should " \ "set this to 10000.") -#define SERVER_PORT_TEXT N_("Server port") +#define CLOCK_SYNCHRO_TEXT N_("Clock synchronisation") +#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") }; + +#define SERVER_PORT_TEXT N_("UDP port") #define SERVER_PORT_LONGTEXT N_( \ "This is the port used for UDP streams. By default, we chose 1234.") @@ -297,41 +315,98 @@ static char *ppsz_align_descriptions[] = { N_("Center"), "multicast solution, you will probably have to indicate the IP address " \ "of your multicasting interface here.") -#define TTL_TEXT N_("Time to live") +#define TTL_TEXT N_("Time To Live") #define TTL_LONGTEXT N_( \ "Indicate here the Time To Live of the multicast packets sent by " \ "the stream output.") #define INPUT_PROGRAM_TEXT N_("Choose program (SID)") #define INPUT_PROGRAM_LONGTEXT N_( \ - "Choose the program to select by giving its Service ID.") - -#define INPUT_AUDIO_TEXT N_("Choose audio") -#define INPUT_AUDIO_LONGTEXT N_( \ - "Give the default type of audio you want to use in a DVD. " \ - "(Developers only)") - -#define INPUT_CHAN_TEXT N_("Choose audio channel") -#define INPUT_CHAN_LONGTEXT N_( \ - "Give the stream number of the audio channel you want to use in a DVD " \ - "(from 1 to 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)." ) + +#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" \ + "Only use this option if you want to read a multi-program stream " \ + "(like DVB streams for example)." ) + +#define INPUT_AUDIOTRACK_TEXT N_("Choose audio track") +#define INPUT_AUDIOTRACK_LONGTEXT N_( \ + "Give the stream number of the audio track you want to use" \ + "(from 0 to n).") + +#define INPUT_SUBTRACK_TEXT N_("Choose subtitles track") +#define INPUT_SUBTRACK_LONGTEXT N_( \ + "Give the stream number of the subtitle track you want to use " \ + "(from 0 to n).") + +#define INPUT_AUDIOTRACK_LANG_TEXT N_("Choose audio language") +#define INPUT_AUDIOTRACK_LANG_LONGTEXT N_( \ + "Give the language of the audio track you want to use " \ + "(comma separted, two or tree letter country code).") + +#define INPUT_SUBTRACK_LANG_TEXT N_("Choose subtitle language") +#define INPUT_SUBTRACK_LANG_LONGTEXT N_( \ + "Give the language of the subtitle track you want to use " \ + "(comma separted, two or tree letter country code).") + +#define INPUT_REPEAT_TEXT N_("Input repetitions") +#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_LIST_TEXT N_("Input list") +#define INPUT_LIST_LONGTEXT N_("Allows you to specify a comma-separated list " \ + "of inputs that will be concatenated.") + +#define INPUT_SLAVE_TEXT N_("Input slave (experimental)") +#define INPUT_SLAVE_LONGTEXT N_("Allows you to play from several files at " \ + "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 " \ + "the form \"{name=bookmark-name,time=optional-time-offset," \ + "bytes=optional-byte-offset},{...}\"") + +#define SUB_CAT_LONGTEXT N_( \ + "These options allow you to modify the behavior of the subpictures " \ + "subsystem. You can for example enable subpictures filters (logo, etc.). " \ + "Enable these filters here and configure them in the " \ + "\"subpictures filters\" modules section. You can also set many " \ + "miscellaneous subpictures options." ) + +#define SUB_MARGIN_TEXT N_("Force subtitle position") +#define SUB_MARGIN_LONGTEXT N_( \ + "You can use this option to place the subtitles under the movie, " \ + "instead of over the movie. Try several positions.") -#define INPUT_SUBT_TEXT N_("Choose subtitle track") -#define INPUT_SUBT_LONGTEXT N_( \ - "Give the stream number of the subtitle channel you want to use " \ - "(from 1 to n).") +#define OSD_TEXT N_("On Screen Display") +#define OSD_LONGTEXT N_( \ + "VLC can display messages on the video. This is called OSD (On Screen " \ + "Display). You can disable this feature here.") -#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 SUB_FILTER_TEXT N_("Subpictures filter module") +#define SUB_FILTER_LONGTEXT N_( \ + "This will allow you to add a subpictures filter for instance to overlay "\ + "a logo.") #define SUB_AUTO_TEXT N_("Autodetect subtitle files") #define SUB_AUTO_LONGTEXT \ 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 \ - N_("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" \ @@ -339,6 +414,11 @@ static char *ppsz_align_descriptions[] = { N_("Center"), "3 = subtitle file matching the movie name with additional chars\n" \ "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 \ N_("Load this subtitle file. To be used when autodetect cannot detect " \ @@ -348,7 +428,7 @@ static char *ppsz_align_descriptions[] = { N_("Center"), #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.") @@ -384,6 +464,54 @@ 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 SOCKS_SERVER_TEXT N_("SOCKS server") +#define SOCKS_SERVER_LONGTEXT N_( \ + "Allow you to specify a SOCKS server to use. It must be of the form " \ + "address:port . It will be used for all TCP connections" ) + +#define SOCKS_USER_TEXT N_("SOCKS user name") +#define SOCKS_USER_LONGTEXT N_("Allows you to modify the user name that will " \ + "be used for the connection to the SOCKS server.") + +#define SOCKS_PASS_TEXT N_("SOCKS password") +#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.") + +#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 " \ @@ -404,9 +532,11 @@ static char *ppsz_align_descriptions[] = { N_("Center"), "These options allow you to set default global options for the " \ "stream output subsystem." ) -#define SOUT_TEXT N_("Choose a stream output") +#define SOUT_TEXT N_("Default stream output chain") #define SOUT_LONGTEXT N_( \ - "Empty if no stream output.") + "You can enter here a default stream output chain. Refer to "\ + "the documentation to learn how to build such chains. " \ + "Warning: this chain will be enabled for all streams." ) #define SOUT_ALL_TEXT N_("Enable streaming of all ES") #define SOUT_ALL_LONGTEXT N_( \ @@ -423,13 +553,13 @@ static char *ppsz_align_descriptions[] = { N_("Center"), #define SOUT_AUDIO_TEXT N_("Enable audio stream output") #define SOUT_AUDIO_LONGTEXT N_( \ - "This allows you to choose if the video stream should be redirected to " \ + "This allows you to choose if the audio 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") @@ -445,10 +575,24 @@ 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." ) +#define FPU_TEXT N_("Enable FPU support") +#define FPU_LONGTEXT N_( \ + "If your processor has a floating point calculation unit, VLC can take " \ + "advantage of it.") + #define MMX_TEXT N_("Enable CPU MMX support") #define MMX_LONGTEXT N_( \ "If your processor supports the MMX instructions set, VLC can take " \ @@ -481,23 +625,32 @@ 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 SD_TEXT N_( "Services discovery modules") +#define SD_LONGTEXT N_( \ + "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_( \ "When selected, VLC will randomly play files in the playlist until " \ "interrupted.") -#define LOOP_TEXT N_("Loop playlist on end") +#define LOOP_TEXT N_("Repeat all") #define LOOP_LONGTEXT N_( \ "If you want VLC to keep playing the playlist indefinitely then enable " \ "this option.") -#define REPEAT_TEXT N_("Repeat the current item") +#define REPEAT_TEXT N_("Repeat current item") #define REPEAT_LONGTEXT N_( \ "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 playlist item. " ) + #define MISC_CAT_LONGTEXT N_( \ "These options allow you to select default modules. Leave these " \ "alone unless you really know what you are doing." ) @@ -511,6 +664,10 @@ static char *ppsz_align_descriptions[] = { N_("Center"), #define ACCESS_LONGTEXT N_( \ "This is a legacy entry to let you configure access modules.") +#define ACCESS_FILTER_TEXT N_("Access filter module") +#define ACCESS_FILTER_LONGTEXT N_( \ + "This is a legacy entry to let you configure access filter modules.") + #define DEMUX_TEXT N_("Demux module") #define DEMUX_LONGTEXT N_( \ "This is a legacy entry to let you configure demux modules.") @@ -529,10 +686,29 @@ static char *ppsz_align_descriptions[] = { N_("Center"), "priorities. You can use it to tune VLC priority against other " \ "programs, or against other VLC instances.") -#define MINIMIZE_THREADS_TXT N_("Minimize number of threads") -#define MINIMIZE_THREADS_LONGTXT N_( \ +#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 VLM_CONF_TEXT N_("VLM configuration file") +#define VLM_CONF_LONGTEXT N_( \ + "This option allows you to specify a VLM configuration file that will " \ + "be read when VLM is launched.") + +#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, " \ @@ -553,7 +729,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.") @@ -617,7 +793,7 @@ static char *ppsz_align_descriptions[] = { N_("Center"), #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_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 VOL_UP_KEY_TEXT N_("Volume up") @@ -626,6 +802,14 @@ static char *ppsz_align_descriptions[] = { N_("Center"), #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 AUDIODELAY_UP_KEY_TEXT N_("Audio delay up") +#define AUDIODELAY_UP_KEY_LONGTEXT N_("Select the key to increase the audio delay.") +#define AUDIODELAY_DOWN_KEY_TEXT N_("Audio delay down") +#define AUDIODELAY_DOWN_KEY_LONGTEXT N_("Select the key to decrease the audio delay.") #define 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") @@ -649,17 +833,54 @@ 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" \ - "\n vlc:quit quit VLC" \ +#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 INTF_SHOW_KEY_TEXT N_("Show interface") +#define INTF_SHOW_KEY_LONGTEXT N_("Raise the interface above 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.") + +#define RECORD_KEY_TEXT N_("Record") +#define RECORD_KEY_LONGTEXT N_("Record access filter start/stop.") + + +#define VLC_USAGE N_( \ + "Usage: %s [options] [playlistitems] ..." \ + "\nYou can specify multiple playlistitems on the commandline. They will be enqueued in the playlist." \ + "\nThe first item specified will be played first." \ + "\n" \ + "\nOptions-styles:" \ + "\n --option A global option that is set for the duration of the program." \ + "\n -option A single letter version of a global --option." \ + "\n :option An option that only applies to the playlistitem directly before it" \ + "\n and that overrides previous settings." \ + "\n" \ + "\nPlaylistitem MRL syntax:" \ + "\n URL[@[title][:chapter][-[title][:chapter]]] [:option=value ...]" \ + "\n" \ + "\n Many of the global --options can also be used as MRL specific :options." \ + "\n Multiple :option=value pairs can be specified." \ + "\n" \ + "\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 Special item to pause the playlist" \ + "\n vlc:quit Special item to quit VLC" \ "\n") @@ -676,131 +897,248 @@ static char *ppsz_align_descriptions[] = { N_("Center"), * N_(text), N_(longtext) ); * add_integer( option_name, i_value, p_callback, N_(text), N_(longtext), b_advanced_option ); - * add_bool( option_name, b_value, p_callback, N_(text), N_(longtext), + * add_bool( option_name, b_value, p_callback, N_(text), N_(longtext), b_advanced_option ); */ vlc_module_begin(); - /* Interface options */ - add_category_hint( N_("Interface"), INTF_CAT_LONGTEXT , VLC_FALSE ); - add_module( "intf", "interface", NULL, NULL, INTF_TEXT, - INTF_LONGTEXT, VLC_TRUE ); - change_short('I'); - add_string( "extraintf", NULL, NULL, EXTRAINTF_TEXT, - EXTRAINTF_LONGTEXT, VLC_FALSE ); - add_integer( "verbose", 0, NULL, VERBOSE_TEXT, VERBOSE_LONGTEXT, - VLC_FALSE ); - change_short('v'); - add_bool( "quiet", 0, NULL, QUIET_TEXT, QUIET_LONGTEXT, VLC_TRUE ); - change_short('q'); - add_string( "language", "auto", NULL, LANGUAGE_TEXT, LANGUAGE_LONGTEXT, - VLC_FALSE ); - change_string_list( ppsz_language, ppsz_language_text, 0 ); - 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 */ +/* Audio options */ + set_category( CAT_AUDIO ); + set_subcategory( SUBCAT_AUDIO_GENERAL ); add_category_hint( N_("Audio"), AOUT_CAT_LONGTEXT , VLC_FALSE ); - add_module( "aout", "audio output", NULL, NULL, AOUT_TEXT, AOUT_LONGTEXT, - VLC_TRUE ); - change_short('A'); + add_bool( "audio", 1, NULL, AUDIO_TEXT, AUDIO_LONGTEXT, VLC_FALSE ); 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( "saved-volume", AOUT_VOLUME_DEFAULT, - AOUT_VOLUME_MIN, AOUT_VOLUME_MAX, NULL, - VOLUME_SAVE_TEXT, VOLUME_SAVE_LONGTEXT, VLC_TRUE ); - add_integer( "aout-rate", -1, NULL, AOUT_RATE_TEXT, AOUT_RATE_LONGTEXT, VLC_TRUE ); + add_integer( "aout-rate", -1, NULL, AOUT_RATE_TEXT, + AOUT_RATE_LONGTEXT, VLC_TRUE ); #if !defined( SYS_DARWIN ) - add_bool( "hq-resampling", 1, NULL, AOUT_RESAMP_TEXT, AOUT_RESAMP_LONGTEXT, VLC_TRUE ); + add_bool( "hq-resampling", 1, NULL, AOUT_RESAMP_TEXT, + AOUT_RESAMP_LONGTEXT, VLC_TRUE ); #endif add_bool( "spdif", 0, NULL, SPDIF_TEXT, SPDIF_LONGTEXT, VLC_FALSE ); - add_integer( "audio-desync", 0, NULL, DESYNC_TEXT, DESYNC_LONGTEXT, VLC_TRUE ); - add_string("audio-filter",0,NULL,AUDIO_FILTER_TEXT, - AUDIO_FILTER_LONGTEXT,VLC_FALSE); - add_module( "audio-channel-mixer", "audio filter", NULL, NULL, - AUDIO_CHANNEL_MIXER, AUDIO_CHANNEL_MIXER_LONGTEXT, - VLC_FALSE ); - - /* Video options */ - add_category_hint( N_("Video"), VOUT_CAT_LONGTEXT , VLC_FALSE ); - add_module( "vout", "video output", NULL, NULL, VOUT_TEXT, VOUT_LONGTEXT, + add_integer( "audio-desync", 0, NULL, DESYNC_TEXT, + DESYNC_LONGTEXT, VLC_TRUE ); + set_subcategory( SUBCAT_AUDIO_AOUT ); + add_module( "aout", "audio output", NULL, NULL, AOUT_TEXT, AOUT_LONGTEXT, VLC_TRUE ); - change_short('V'); + change_short('A'); + set_subcategory( SUBCAT_AUDIO_AFILTER ); + add_module_list_cat( "audio-filter", SUBCAT_AUDIO_AFILTER, 0, + NULL, AUDIO_FILTER_TEXT, + AUDIO_FILTER_LONGTEXT, VLC_FALSE ); + set_subcategory( SUBCAT_AUDIO_VISUAL ); + add_module( "audio-visual", "visualization",NULL, NULL,AUDIO_VISUAL_TEXT, + AUDIO_VISUAL_LONGTEXT, VLC_FALSE ); + +/* Video options */ + set_category( CAT_VIDEO ); + set_subcategory( SUBCAT_VIDEO_GENERAL ); + add_category_hint( N_("Video"), VOUT_CAT_LONGTEXT , VLC_FALSE ); + add_bool( "video", 1, NULL, VIDEO_TEXT, VIDEO_LONGTEXT, VLC_TRUE ); + add_bool( "grayscale", 0, NULL, GRAYSCALE_TEXT, + GRAYSCALE_LONGTEXT, VLC_FALSE ); + add_bool( "fullscreen", 0, NULL, FULLSCREEN_TEXT, + FULLSCREEN_LONGTEXT, VLC_FALSE ); + change_short('f'); + add_bool( "skip-frames", 1, NULL, SKIP_FRAMES_TEXT, + SKIP_FRAMES_LONGTEXT, VLC_FALSE ); + add_bool( "quiet-synchro", 0, NULL, QUIET_SYNCHRO_TEXT, + QUIET_SYNCHRO_LONGTEXT, VLC_TRUE ); +#ifndef SYS_DARWIN + add_bool( "overlay", 1, NULL, OVERLAY_TEXT, OVERLAY_LONGTEXT, VLC_TRUE ); +#endif + add_bool( "video-on-top", 0, NULL, VIDEO_ON_TOP_TEXT, + VIDEO_ON_TOP_LONGTEXT, VLC_FALSE ); + + set_section( N_("Snapshot") , NULL ); + 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_FALSE ); + change_string_list( ppsz_snap_formats, NULL, 0 ); + + set_section( N_("Window properties" ), NULL ); 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( "aspect-ratio", "", NULL, + ASPECT_RATIO_TEXT, ASPECT_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, + 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 ); - add_bool( "grayscale", 0, NULL, GRAYSCALE_TEXT, GRAYSCALE_LONGTEXT, VLC_TRUE ); - add_bool( "fullscreen", 0, NULL, FULLSCREEN_TEXT, - FULLSCREEN_LONGTEXT, VLC_FALSE ); -#ifndef SYS_DARWIN - add_bool( "overlay", 1, NULL, OVERLAY_TEXT, OVERLAY_LONGTEXT, VLC_TRUE ); -#endif - add_bool( "video-on-top", 0, NULL, VIDEO_ON_TOP_TEXT, VIDEO_ON_TOP_LONGTEXT, VLC_FALSE ); - add_integer( "spumargin", -1, NULL, SPUMARGIN_TEXT, - SPUMARGIN_LONGTEXT, VLC_TRUE ); - add_bool( "osd", 1, NULL, OSD_TEXT, OSD_LONGTEXT, VLC_FALSE ); - add_module( "filter", "video filter", NULL, NULL, + + set_subcategory( SUBCAT_VIDEO_VOUT ); + add_module( "vout", "video output", NULL, NULL, VOUT_TEXT, VOUT_LONGTEXT, + VLC_TRUE ); + change_short('V'); + + set_subcategory( SUBCAT_VIDEO_VFILTER ); + add_module_list_cat( "vout-filter", SUBCAT_VIDEO_VFILTER, NULL, NULL, FILTER_TEXT, FILTER_LONGTEXT, VLC_FALSE ); - add_string( "aspect-ratio", "", NULL, - ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, VLC_TRUE ); + add_deprecated( "filter", VLC_FALSE ); /*deprecated since 0.8.2 */ #if 0 add_string( "pixel-ratio", "1", NULL, PIXEL_RATIO_TEXT, PIXEL_RATIO_TEXT ); #endif - /* Input options */ - add_category_hint( N_("Input"), INPUT_CAT_LONGTEXT , VLC_FALSE ); - add_integer( "cr-average", 40, NULL, CR_AVERAGE_TEXT, - CR_AVERAGE_LONGTEXT, VLC_FALSE ); - 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_string( "iface-addr", "", NULL, IFACE_ADDR_TEXT, IFACE_ADDR_LONGTEXT, VLC_TRUE ); +/* Subpictures options */ + set_subcategory( SUBCAT_VIDEO_SUBPIC ); + set_section( N_("On Screen Display") , NULL ); + add_category_hint( N_("Subpictures"), SUB_CAT_LONGTEXT , VLC_FALSE ); + add_bool( "osd", 1, NULL, OSD_TEXT, OSD_LONGTEXT, VLC_FALSE ); - add_integer( "program", 0, NULL, - INPUT_PROGRAM_TEXT, INPUT_PROGRAM_LONGTEXT, VLC_TRUE ); - add_integer( "audio-type", -1, NULL, - INPUT_AUDIO_TEXT, INPUT_AUDIO_LONGTEXT, VLC_TRUE ); - add_integer( "audio-channel", -1, NULL, - INPUT_CHAN_TEXT, INPUT_CHAN_LONGTEXT, VLC_FALSE ); - add_integer( "spu-channel", -1, NULL, - INPUT_SUBT_TEXT, INPUT_SUBT_LONGTEXT, VLC_FALSE ); + set_section( N_("Subtitles") , NULL ); + add_file( "sub-file", NULL, NULL, SUB_FILE_TEXT, + SUB_FILE_LONGTEXT, VLC_FALSE ); add_bool( "sub-autodetect-file", VLC_TRUE, NULL, SUB_AUTO_TEXT, SUB_AUTO_LONGTEXT, VLC_FALSE ); add_integer( "sub-autodetect-fuzzy", 3, NULL, SUB_FUZZY_TEXT, SUB_FUZZY_LONGTEXT, VLC_TRUE ); - add_file( "sub-file", NULL, NULL, - SUB_FILE_TEXT, SUB_FILE_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_integer( "sub-margin", -1, NULL, SUB_MARGIN_TEXT, + SUB_MARGIN_LONGTEXT, VLC_TRUE ); + 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 ); + +/* Input options */ + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_ACCESS ); + add_category_hint( N_("Input"), INPUT_CAT_LONGTEXT , VLC_FALSE ); + add_module( "access", "access2", NULL, NULL, ACCESS_TEXT, + ACCESS_LONGTEXT, VLC_TRUE ); + + set_subcategory( SUBCAT_INPUT_ACCESS_FILTER ); + add_module_list_cat( "access-filter", SUBCAT_INPUT_ACCESS_FILTER, NULL, NULL, + ACCESS_FILTER_TEXT, ACCESS_FILTER_LONGTEXT, VLC_FALSE ); + + + set_subcategory( SUBCAT_INPUT_DEMUX ); + add_module( "demux", "demux2", NULL, NULL, DEMUX_TEXT, + DEMUX_LONGTEXT, VLC_TRUE ); + set_subcategory( SUBCAT_INPUT_VCODEC ); + set_subcategory( SUBCAT_INPUT_ACODEC ); + set_subcategory( SUBCAT_INPUT_SCODEC ); + set_subcategory( SUBCAT_INPUT_ADVANCED ); + + set_section( N_( "Track settings" ), NULL ); + add_integer( "program", 0, NULL, + INPUT_PROGRAM_TEXT, INPUT_PROGRAM_LONGTEXT, VLC_TRUE ); + add_string( "programs", "", NULL, + INPUT_PROGRAMS_TEXT, INPUT_PROGRAMS_LONGTEXT, VLC_FALSE ); + add_integer( "audio-track", -1, NULL, + INPUT_AUDIOTRACK_TEXT, INPUT_AUDIOTRACK_LONGTEXT, VLC_FALSE ); + add_deprecated( "audio-channel", VLC_FALSE ); /*deprecated since 0.8.2 */ + add_integer( "sub-track", -1, NULL, + INPUT_SUBTRACK_TEXT, INPUT_SUBTRACK_LONGTEXT, VLC_FALSE ); + add_deprecated("spu-channel",VLC_FALSE); /*deprecated since 0.8.2*/ + add_string( "audio-language", "", NULL, + INPUT_AUDIOTRACK_LANG_TEXT, INPUT_AUDIOTRACK_LANG_LONGTEXT, + VLC_FALSE ); + add_string( "sub-language", "", NULL, + INPUT_SUBTRACK_LANG_TEXT, INPUT_SUBTRACK_LANG_LONGTEXT, + VLC_FALSE ); + + + set_section( N_( "Playback control" ) , NULL); 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-list", NULL, NULL, + INPUT_LIST_TEXT, INPUT_LIST_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 ); + + set_section( N_( "Default devices") , NULL ) - 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_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 ); + set_section( N_( "Network settings" ), NULL ); + + 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_string( "iface-addr", "", NULL, IFACE_ADDR_TEXT, + IFACE_ADDR_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 ); change_short('4'); - /* Decoder options */ + set_section( N_( "Socks proxy") , NULL ) + add_string( "socks", NULL, NULL, + SOCKS_SERVER_TEXT, SOCKS_SERVER_LONGTEXT, VLC_TRUE ); + add_string( "socks-user", NULL, NULL, + SOCKS_USER_TEXT, SOCKS_USER_LONGTEXT, VLC_TRUE ); + add_string( "socks-pwd", NULL, NULL, + SOCKS_PASS_TEXT, SOCKS_PASS_LONGTEXT, VLC_TRUE ); + + + set_section( N_("Metadata" ) , NULL ) + 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 ); + + set_section( N_( "Advanced" ), NULL ); + + add_integer( "cr-average", 40, NULL, CR_AVERAGE_TEXT, + CR_AVERAGE_LONGTEXT, VLC_FALSE ); + add_integer( "clock-synchro", -1, NULL, CLOCK_SYNCHRO_TEXT, + CLOCK_SYNCHRO_LONGTEXT, VLC_FALSE ); + change_integer_list( pi_clock_values, ppsz_clock_descriptions, 0 ); + +/* Decoder options */ add_category_hint( N_("Decoders"), CODEC_CAT_LONGTEXT , VLC_TRUE ); - add_module( "codec", "decoder", NULL, NULL, CODEC_TEXT, CODEC_LONGTEXT, VLC_TRUE ); - add_module( "encoder", "encoder", NULL, NULL, ENCODER_TEXT, ENCODER_LONGTEXT, VLC_TRUE ); + add_string( "codec", NULL, NULL, CODEC_TEXT, + CODEC_LONGTEXT, VLC_TRUE ); + add_string( "encoder", NULL, NULL, ENCODER_TEXT, + ENCODER_LONGTEXT, VLC_TRUE ); - /* Stream output options */ +/* Stream output options */ + set_category( CAT_SOUT ); + set_subcategory( SUBCAT_SOUT_GENERAL ); add_category_hint( N_("Stream output"), SOUT_CAT_LONGTEXT , VLC_TRUE ); + add_string( "sout", NULL, NULL, SOUT_TEXT, SOUT_LONGTEXT, VLC_TRUE ); add_bool( "sout-display", VLC_FALSE, NULL, SOUT_DISPLAY_TEXT, SOUT_DISPLAY_LONGTEXT, VLC_TRUE ); @@ -812,19 +1150,32 @@ vlc_module_begin(); SOUT_AUDIO_LONGTEXT, VLC_TRUE ); add_bool( "sout-video", 1, NULL, SOUT_VIDEO_TEXT, SOUT_VIDEO_LONGTEXT, VLC_TRUE ); + add_integer( "ttl", 1, NULL, TTL_TEXT, TTL_LONGTEXT, VLC_TRUE ); - add_module( "packetizer", "packetizer", NULL, NULL, - PACKETIZER_TEXT, PACKETIZER_LONGTEXT, VLC_TRUE ); + set_subcategory( SUBCAT_SOUT_STREAM ); + set_subcategory( SUBCAT_SOUT_MUX ); add_module( "mux", "sout mux", NULL, NULL, MUX_TEXT, MUX_LONGTEXT, VLC_TRUE ); + set_subcategory( SUBCAT_SOUT_ACO ); add_module( "access_output", "sout access", NULL, NULL, ACCESS_OUTPUT_TEXT, ACCESS_OUTPUT_LONGTEXT, VLC_TRUE ); - add_integer( "ttl", 1, NULL, TTL_TEXT, TTL_LONGTEXT, VLC_TRUE ); + set_subcategory( SUBCAT_SOUT_PACKETIZER ); + add_module( "packetizer","packetizer", NULL, NULL, + PACKETIZER_TEXT, PACKETIZER_LONGTEXT, VLC_TRUE ); + set_subcategory( SUBCAT_SOUT_SAP ); + 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 ); + set_subcategory( SUBCAT_SOUT_VOD ); - /* CPU options */ +/* CPU options */ + set_category( CAT_ADVANCED ); + set_subcategory( SUBCAT_ADVANCED_CPU ); add_category_hint( N_("CPU"), CPU_CAT_LONGTEXT, VLC_TRUE ); -#if defined( __i386__ ) + add_bool( "fpu", 1, NULL, FPU_TEXT, FPU_LONGTEXT, VLC_TRUE ); +#if defined( __i386__ ) || defined( __x86_64__ ) add_bool( "mmx", 1, NULL, MMX_TEXT, MMX_LONGTEXT, VLC_TRUE ); add_bool( "3dn", 1, NULL, THREE_DN_TEXT, THREE_DN_LONGTEXT, VLC_TRUE ); add_bool( "mmxext", 1, NULL, MMXEXT_TEXT, MMXEXT_LONGTEXT, VLC_TRUE ); @@ -835,136 +1186,373 @@ vlc_module_begin(); add_bool( "altivec", 1, NULL, ALTIVEC_TEXT, ALTIVEC_LONGTEXT, VLC_TRUE ); #endif - /* Playlist options */ - add_category_hint( N_("Playlist"), PLAYLIST_CAT_LONGTEXT , VLC_FALSE ); - add_bool( "random", 0, NULL, RANDOM_TEXT, RANDOM_LONGTEXT, VLC_FALSE ); - change_short('Z'); - add_bool( "loop", 0, NULL, LOOP_TEXT, LOOP_LONGTEXT, VLC_FALSE ); - change_short('L'); - add_bool( "repeat", 0, NULL, REPEAT_TEXT, REPEAT_LONGTEXT, VLC_TRUE ); - change_short('R'); - - /* Misc options */ +/* Misc options */ + set_subcategory( SUBCAT_ADVANCED_MISC ); + set_section( N_("Special modules"), NULL ); 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_module( "memcpy", "memcpy", NULL, NULL, MEMCPY_TEXT, + MEMCPY_LONGTEXT, VLC_TRUE ); + add_module( "audio-channel-mixer", "audio mixer", NULL, NULL, + AUDIO_CHANNEL_MIXER, AUDIO_CHANNEL_MIXER_LONGTEXT, VLC_TRUE ); - add_bool( "minimize-threads", 0, NULL, MINIMIZE_THREADS_TXT, MINIMIZE_THREADS_LONGTXT, VLC_TRUE ); + set_section( N_("Plugins" ), NULL ); + add_bool( "plugins-cache", VLC_TRUE, NULL, PLUGINS_CACHE_TEXT, + PLUGINS_CACHE_LONGTEXT, VLC_TRUE ); + add_directory( "plugin-path", NULL, NULL, PLUGIN_PATH_TEXT, + PLUGIN_PATH_LONGTEXT, VLC_TRUE ); + + set_section( N_("Performance options"), NULL ); + 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) - 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 ); + 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_FALSE ); + 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 + + set_section( N_("Miscellaneous" ), NULL ); + add_string( "vlm-conf", NULL, NULL, VLM_CONF_TEXT, + VLM_CONF_LONGTEXT, VLC_TRUE ); + +#if !defined(WIN32) + add_bool( "daemon", 0, NULL, DAEMON_TEXT, DAEMON_LONGTEXT, VLC_TRUE ); + change_short('d'); #endif - /* Hotkey options*/ +/* Playlist options */ + set_category( CAT_PLAYLIST ); + set_subcategory( SUBCAT_PLAYLIST_GENERAL ); + add_category_hint( N_("Playlist"), PLAYLIST_CAT_LONGTEXT , VLC_FALSE ); + add_bool( "random", 0, NULL, RANDOM_TEXT, RANDOM_LONGTEXT, VLC_FALSE ); + change_short('Z'); + add_bool( "loop", 0, NULL, LOOP_TEXT, LOOP_LONGTEXT, VLC_FALSE ); + change_short('L'); + add_bool( "repeat", 0, NULL, REPEAT_TEXT, REPEAT_LONGTEXT, VLC_FALSE ); + change_short('R'); + add_bool( "play-and-stop", 0, NULL, PAS_TEXT, PAS_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 ); + change_short('S'); + +/* Interface options */ + set_category( CAT_INTERFACE ); + set_subcategory( SUBCAT_INTERFACE_GENERAL ); + add_category_hint( N_("Interface"), INTF_CAT_LONGTEXT , VLC_FALSE ); + set_section ( N_("Interface module" ), NULL ); + add_module_cat( "intf", SUBCAT_INTERFACE_GENERAL, NULL, NULL, INTF_TEXT, + INTF_LONGTEXT, VLC_FALSE ); + change_short('I'); + + set_section ( N_("Extra interface modules" ), NULL ); + add_module_list_cat( "extraintf", SUBCAT_INTERFACE_GENERAL, + NULL, NULL, EXTRAINTF_TEXT, + EXTRAINTF_LONGTEXT, VLC_FALSE ); + + set_section ( N_("Miscellaneous"), NULL ); + add_integer( "verbose", 0, NULL, VERBOSE_TEXT, VERBOSE_LONGTEXT, + VLC_FALSE ); + change_short('v'); + add_bool( "quiet", 0, NULL, QUIET_TEXT, QUIET_LONGTEXT, VLC_TRUE ); + change_short('q'); + add_string( "language", "auto", NULL, LANGUAGE_TEXT, LANGUAGE_LONGTEXT, + VLC_FALSE ); + change_string_list( ppsz_language, ppsz_language_text, 0 ); + add_bool( "color", 0, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE ); + add_bool( "advanced", 0, NULL, ADVANCED_TEXT, ADVANCED_LONGTEXT, + VLC_FALSE ); + + set_subcategory( SUBCAT_INTERFACE_CONTROL ); + add_module_list_cat( "control", SUBCAT_INTERFACE_CONTROL, NULL, NULL, + CONTROL_TEXT, CONTROL_LONGTEXT, VLC_FALSE ); + +/* Hotkey options*/ + set_subcategory( SUBCAT_INTERFACE_HOTKEYS ); 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 ); +/* Don't use the following combo's */ + +/* copy KEY_MODIFIER_COMMAND|'c' + * cut KEY_MODIFIER_COMMAND|'x' + * paste KEY_MODIFIER_COMMAND|'v' + * select all KEY_MODIFIER_COMMAND|'a' + * preferences KEY_MODIFIER_COMMAND|',' + * hide vlc KEY_MODIFIER_COMMAND|'h' + * hide other KEY_MODIFIER_COMMAND|KEY_MODIFIER_ALT|'h' + * open file KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'o' + * open KEY_MODIFIER_COMMAND|'o' + * open disk KEY_MODIFIER_COMMAND|'d' + * open network KEY_MODIFIER_COMMAND|'n' + * save playlist KEY_MODIFIER_COMMAND|'s' + * playlist random KEY_MODIFIER_COMMAND|'z' + * playlist repeat all KEY_MODIFIER_COMMAND|'l' + * playlist repeat KEY_MODIFIER_COMMAND|'r' + * video half size KEY_MODIFIER_COMMAND|'0' + * video normal size KEY_MODIFIER_COMMAND|'1' + * video double size KEY_MODIFIER_COMMAND|'2' + * video fit to screen KEY_MODIFIER_COMMAND|'3' + * minimize window KEY_MODIFIER_COMMAND|'m' + * close window KEY_MODIFIER_COMMAND|'w' + * show controller KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'c' + * show playlist KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'p' + * show info KEY_MODIFIER_COMMAND|'i' + * help KEY_MODIFIER_COMMAND|'?' + */ +# 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_ALT|KEY_DOWN +# define KEY_SUBDELAY_UP 'j' +# define KEY_SUBDELAY_DOWN 'h' +# define KEY_AUDIODELAY_UP 'g' +# define KEY_AUDIODELAY_DOWN 'f' +# define KEY_AUDIO_TRACK 'l' +# define KEY_SUBTITLE_TRACK 's' +# define KEY_INTF_SHOW 'i' +# define KEY_SNAPSHOT KEY_MODIFIER_COMMAND|KEY_MODIFIER_ALT|'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|']' +# define KEY_RECORD KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'r' + #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_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_AUDIO_TRACK 'l' +# define KEY_SUBTITLE_TRACK 'k' +# define KEY_INTF_SHOW 'i' +# define KEY_SNAPSHOT KEY_MODIFIER_CTRL|KEY_MODIFIER_ALT|'s' + +# 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|'v' +# define KEY_HISTORY_FORWARD KEY_MODIFIER_CTRL|'b' +# define KEY_RECORD KEY_MODIFIER_CTRL|'r' #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-audiodelay-up", KEY_AUDIODELAY_UP, NULL, + AUDIODELAY_UP_KEY_TEXT, AUDIODELAY_UP_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-audiodelay-down", KEY_AUDIODELAY_DOWN, NULL, + AUDIODELAY_DOWN_KEY_TEXT, AUDIODELAY_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-intf-show", KEY_INTF_SHOW, NULL, + INTF_SHOW_KEY_TEXT, INTF_SHOW_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-snapshot", KEY_SNAPSHOT, NULL, + SNAP_KEY_TEXT, SNAP_KEY_LONGTEXT, VLC_TRUE ); + + 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 ); + add_key( "key-record", KEY_RECORD, NULL, + RECORD_KEY_TEXT, RECORD_KEY_LONGTEXT, VLC_TRUE ); + /* Usage (mainly useful for cmd line stuff) */ - add_usage_hint( PLAYLIST_USAGE ); + /* add_usage_hint( PLAYLIST_USAGE ); */ set_description( N_("main program") ); set_capability( "main", 100 ); @@ -973,19 +1561,25 @@ vlc_module_end(); static module_config_t p_help_config[] = { { CONFIG_ITEM_BOOL, NULL, "help", 'h', - N_("print help (can be combined with --advanced)") }, + N_("print help for VLC (can be combined with --advanced)") }, { CONFIG_ITEM_BOOL, NULL, "longhelp", 'H', - N_("print detailed help (can be combined with --advanced)") }, + N_("print help for VLC and all it's modules (can be combined with --advanced)") }, + { CONFIG_ITEM_BOOL, NULL, "advanced", '\0', + N_("print help for the advanced options") }, + { CONFIG_ITEM_BOOL, NULL, "help-verbose", '\0', + N_("ask for extra verbosity when displaying help") }, { CONFIG_ITEM_BOOL, NULL, "list", 'l', N_("print a list of available modules") }, { CONFIG_ITEM_STRING, NULL, "module", 'p', - N_("print help on module (can be combined with --advanced)") }, + N_("print help on a specific module (can be combined with --advanced)") }, { CONFIG_ITEM_BOOL, NULL, "save-config", '\0', N_("save the current command line options in the config") }, { CONFIG_ITEM_BOOL, NULL, "reset-config", '\0', 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 } @@ -1020,6 +1614,14 @@ 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-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 }, @@ -1045,5 +1647,9 @@ 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}, + { "key-record", ACTIONID_RECORD, 0 }, { NULL, 0, 0 } }; +