X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.h;h=d219c10e2a86b59cae0a189ba749f4a799312307;hb=bc138de9f090772a5bf99d93914684e3db151fa6;hp=561418e712150cdb9b051f1fbc87a3533f3a8a52;hpb=d2c70247d8dfb11aa6d1e94db2e39f910383d561;p=vlc diff --git a/src/libvlc.h b/src/libvlc.h index 561418e712..d219c10e2a 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.116 2003/12/10 17:19:05 yoann Exp $ + * $Id$ * * Authors: Vincent Seguin * Samuel Hocevar @@ -31,9 +31,10 @@ static char *ppsz_language[] = "fr", "hu", "it", "ja", "nl", "no", "pl", "pt_BR", "ru", "sv" }; static char *ppsz_language_text[] = -{ N_("Auto"), N_("English US"), N_("English GB"), N_("Spanish"), N_("German"), - N_("French"), N_("Hungarian"), N_("Italian"), N_("Japanese"), N_("Dutch"), N_("Norwegian"), - N_("Polish"), N_("Portuguese BR"), N_("Russian"), N_("Swedish") }; +{ 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") }; /***************************************************************************** * Configuration options for the main program. Each module will also separatly @@ -83,24 +84,24 @@ static char *ppsz_language_text[] = #define ADVANCED_LONGTEXT N_( \ "When this option is turned on, the preferences and/or interfaces will " \ "show all the available options, including those that most users should " \ - "never touch") + "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_("Plugin search path") +#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 plugins.") + "for its modules.") #define AOUT_CAT_LONGTEXT N_( \ - "These options allow you to tune VLC's audio subsystem, " \ - "and to add audio filters which can be used for " \ + "These options allow you to modify the behaviour of the audio " \ + "subsystem, and to add audio filters which can be used for " \ "postprocessing or visual effects (spectrum analyzer, ...).\n" \ - "To tune these filters, have a look at the \"audio filter\" " \ - "plugin options.") + "Enable these filters here, and configure them in the \"audio filters\" " \ + "modules section.") #define AOUT_TEXT N_("Audio output module") #define AOUT_LONGTEXT N_( \ @@ -110,11 +111,11 @@ static char *ppsz_language_text[] = #define AUDIO_TEXT N_("Enable audio") #define AUDIO_LONGTEXT N_( \ - "You can completely disable the audio output. In this case the audio " \ - "decoding will not take place, and it will save some processing power.") + "You can completely disable the audio output. In this case, the audio " \ + "decoding stage will not take place, thus saving some processing power.") #define MONO_TEXT N_("Force mono audio") -#define MONO_LONGTEXT N_("This will force a mono audio output") +#define MONO_LONGTEXT N_("This will force a mono audio output.") #define VOLUME_TEXT N_("Audio output volume") #define VOLUME_LONGTEXT N_( \ @@ -133,20 +134,22 @@ static char *ppsz_language_text[] = #if !defined( SYS_DARWIN ) #define AOUT_RESAMP_TEXT N_("High quality audio resampling") #define AOUT_RESAMP_LONGTEXT N_( \ - "High quality audio resampling can be processor intensive so you can " \ + "This uses a high quality audio resampling algorithm. High quality "\ + "audio resampling can be processor intensive so you can " \ "disable it and a cheaper resampling algorithm will be used instead.") #endif -#define DESYNC_TEXT N_("Compensate desynchronization of audio (in ms)") +#define DESYNC_TEXT N_("Audio desynchronization compensation") #define DESYNC_LONGTEXT N_( \ - "This option allows you to delay the audio output. This can be handy if " \ - "you notice a lag between the video and the audio.") + "This option allows you to delay the audio output. You must give a " \ + "number of milliseconds. This can be handy if you notice a lag " \ + "between the video and the audio.") -#define MULTICHA_TEXT N_("Choose prefered audio output channels mode") +#define MULTICHA_TEXT N_("Preferred audio output channels mode") #define MULTICHA_LONGTEXT N_( \ "This option allows you to set the audio output channels mode that will " \ "be used by default when possible (ie. if your hardware supports it as " \ - "well as the audio stream being played)") + "well as the audio stream being played).") #define SPDIF_TEXT N_("Use the S/PDIF audio output when available") #define SPDIF_LONGTEXT N_( \ @@ -156,24 +159,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 " \ - "the sound.") + "the sound, or audio visualization modules (spectrum analyzer, ...).") -#define HEADPHONE_TEXT N_("Headphone virtual spatialization effect") -#define HEADPHONE_LONGTEXT N_( \ - "This effect gives you the feeling that you are standing in a room " \ - "with a complete 5.1 speaker set when using only a headphone, " \ - "providing a more realistic sound experience. It should also be " \ - "more comfortable and less tiring when listening to music for " \ - "long periods of time.\nIt works with any source format from mono " \ - "to 5.1.") +#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 options related to " \ - "the video output subsystem. You can for example enable " \ - "video filters, like deinterlacing, constrast / hue / " \ - "saturation adjusting, ...\n" \ - "Enable these filters here and configure them in the video " \ - "filters plugins section." ) + "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 " \ + "them in the \"video filters\" modules section. You can also set many " \ + "miscellaneous video options." ) #define VOUT_TEXT N_("Video output module") #define VOUT_LONGTEXT N_( \ @@ -183,8 +182,8 @@ static char *ppsz_language_text[] = #define VIDEO_TEXT N_("Enable video") #define VIDEO_LONGTEXT N_( \ - "You can completely disable the video output. In this case the video " \ - "decoding stage will not take place, which will save some processing power.") + "You can completely disable the video output. In this case, the video " \ + "decoding stage will not take place, thus saving some processing power.") #define WIDTH_TEXT N_("Video width") #define WIDTH_LONGTEXT N_( \ @@ -196,11 +195,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 " \ "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") }; #define ZOOM_TEXT N_("Zoom video") #define ZOOM_LONGTEXT N_( \ @@ -219,11 +236,11 @@ static char *ppsz_language_text[] = #define OVERLAY_TEXT N_("Overlay video output") #define OVERLAY_LONGTEXT N_( \ "If enabled, VLC will try to take advantage of the overlay capabilities " \ - "of your graphics card.") + "of your graphics card (hardware acceleration).") #define VIDEO_ON_TOP_TEXT N_("Always on top") #define VIDEO_ON_TOP_LONGTEXT N_("Always place the video window on top of " \ - "other windows" ) + "other windows." ) #define SPUMARGIN_TEXT N_("Force SPU position") #define SPUMARGIN_LONGTEXT N_( \ @@ -232,7 +249,8 @@ static char *ppsz_language_text[] = #define OSD_TEXT N_("On Screen Display") #define OSD_LONGTEXT N_( \ - "You can disable the messages VLC creates in the video.") + "VLC can display messages on the video. This is called OSD (On Screen " \ + "Display). You can disable this feature here.") #define FILTER_TEXT N_("Video filter module") #define FILTER_LONGTEXT N_( \ @@ -249,17 +267,10 @@ static char *ppsz_language_text[] = "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_( " " ) +#define INPUT_CAT_LONGTEXT N_( \ + "These options allow you to modify the behaviour of the input " \ + "subsystem, such as the DVD or VCD device, the network interface " \ + "settings or the subtitle channel.") #define CR_AVERAGE_TEXT N_("Clock reference average counter") #define CR_AVERAGE_LONGTEXT N_( \ @@ -295,35 +306,49 @@ static char *ppsz_language_text[] = "Give the default type of audio you want to use in a DVD. " \ "(Developers only)") -#define INPUT_CHAN_TEXT N_("Choose channel") +#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).") -#define INPUT_SUBT_TEXT N_("Choose subtitles track") +#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 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 (second)") +#define START_TIME_LONGTEXT N_("Input start time (second)") + +#define STOP_TIME_TEXT N_("Input stop time (second)") +#define STOP_TIME_LONGTEXT N_("Input stop time (second)") + +#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_LONGTEXT \ - "This determines how fuzzy subtitle and movie filenaming matching " \ + N_("This determines how fuzzy subtitle and movie filenaming 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_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 @@ -336,13 +361,25 @@ static char *ppsz_language_text[] = #endif #define VCD_DEV_TEXT N_("VCD device") +#ifdef HAVE_VCDX +#define VCD_DEV_LONGTEXT N_( \ + "This is the default VCD device to use. " \ + "If you don't specify anything, we'll scan for a suitable CD-ROM device." ) +#else #define VCD_DEV_LONGTEXT N_( \ - "This is the default VCD device to use.") + "This is the default VCD device to use." ) +#endif -#define CDAUDIO_DEV_TEXT N_("CD Audio device") +#define CDAUDIO_DEV_TEXT N_("Audio CD device") +#ifdef HAVE_CDDAX #define CDAUDIO_DEV_LONGTEXT N_( \ - "This is the default CD Audio device to use.") - + "This is the default Audio CD device to use. " \ + "If you don't specify anything, we'll scan for a suitable CD-ROM device." ) +#else +#define CDAUDIO_DEV_LONGTEXT N_( \ + "This is the default Audio CD device to use." ) +#endif + #define IPV6_TEXT N_("Force IPv6") #define IPV6_LONGTEXT N_( \ "If you check this box, IPv6 will be used by default for all UDP and " \ @@ -353,18 +390,50 @@ static char *ppsz_language_text[] = "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 " \ "alter this option as it can break playback of all your streams." ) -#define CODEC_TEXT N_("Choose preferred codecs list") +#define CODEC_TEXT N_("Preferred codecs list") #define CODEC_LONGTEXT N_( \ "This allows you to select a list of codecs that VLC will use in " \ "priority. For instance, 'dummy,a52' will try the dummy and a52 codecs " \ "before trying the other ones.") -#define ENCODER_TEXT N_("Choose preferred encoders list") +#define ENCODER_TEXT N_("Preferred encoders list") #define ENCODER_LONGTEXT N_( \ "This allows you to select a list of encoders that VLC will use in " \ "priority") @@ -401,7 +470,7 @@ static char *ppsz_language_text[] = "multiple playlist item (automatically insert gather stream_out " \ "if not specified)" ) -#define PACKETIZER_TEXT N_("Choose preferred packetizer list") +#define PACKETIZER_TEXT N_("Preferred packetizer list") #define PACKETIZER_LONGTEXT N_( \ "This allows you to select the order in which VLC will choose its " \ "packetizers." ) @@ -438,6 +507,11 @@ static char *ppsz_language_text[] = "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 " \ @@ -457,9 +531,9 @@ static char *ppsz_language_text[] = "If you want VLC to keep playing the playlist indefinitely then enable " \ "this option.") -#define REPEAT_TEXT N_("Repeat the current playlistitem") +#define REPEAT_TEXT N_("Repeat the current item") #define REPEAT_LONGTEXT N_( \ - "When this is active VLC will keep playing the current playlistitem " \ + "When this is active, VLC will keep playing the current playlist item " \ "over and over again.") #define MISC_CAT_LONGTEXT N_( \ @@ -473,13 +547,13 @@ static char *ppsz_language_text[] = #define ACCESS_TEXT N_("Access module") #define ACCESS_LONGTEXT N_( \ - "This is a legacy entry to let you configure access modules") + "This is a legacy entry to let you configure access modules.") #define DEMUX_TEXT N_("Demux module") #define DEMUX_LONGTEXT N_( \ - "This is a legacy entry to let you configure demux modules") + "This is a legacy entry to let you configure demux modules.") -#define RT_PRIORITY_TEXT N_("Allow VLC to run with a real-time priority") +#define RT_PRIORITY_TEXT N_("Allow real-time priority") #define RT_PRIORITY_LONGTEXT N_( \ "Running VLC in real-time priority will allow for much more precise " \ "scheduling and yield better, especially when streaming content. " \ @@ -487,10 +561,17 @@ static char *ppsz_language_text[] = "slow. You should only activate this if you know what you're " \ "doing.") -#define MINIMIZE_THREADS_TXT N_("Minimize number of threads needed to run VLC") -#define MINIMIZE_THREADS_LONGTXT N_("Minimize number of threads needed to run VLC") +#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 ONEINSTANCE_TEXT N_("Allow only one running instance of VLC") +#define MINIMIZE_THREADS_TXT N_("Minimize number of threads") +#define MINIMIZE_THREADS_LONGTXT N_( \ + "This option minimizes the number of threads needed to run VLC") + +#define ONEINSTANCE_TEXT N_("Allow only one running instance") #define ONEINSTANCE_LONGTEXT N_( \ "Allowing only one running instance of VLC can sometimes be useful, " \ "for instance if you associated VLC with some media types and you " \ @@ -503,7 +584,7 @@ static char *ppsz_language_text[] = "Increasing the priority of the process will very likely improve your " \ "playing experience as it allows VLC not to be disturbed by other " \ "applications that could otherwise take too much processor time.\n" \ - "However be advise that in certain circumstances (bugs) VLC could take " \ + "However be advised that in certain circumstances (bugs) VLC could take " \ "all the processor time and render the whole system unresponsive which " \ "might require a reboot of your machine.") @@ -517,77 +598,108 @@ static char *ppsz_language_text[] = #define WIN9X_CV_TEXT N_("Condition variables implementation for Win9x " \ "(developers only)") #define WIN9X_CV_LONGTEXT N_( \ - "On Windows 9x/Me we use a fast but not correct condition variables " \ + "On Windows 9x/Me you can use a fast but incorrect condition variables " \ "implementation (more precisely there is a possibility for a race " \ "condition to happen). " \ - "However it is possible to use slower alternatives which should be more " \ + "However it is possible to use slower alternatives which are more " \ "robust. " \ "Currently you can choose between implementation 0 (which is the " \ - "default and the fastest), 1 and 2.") + "fastest but slightly incorrect), 1 (default) and 2.") -#define HOTKEY_CAT_LONGTEXT N_( " " ) +#define HOTKEY_CAT_LONGTEXT N_( "These settings are the global VLC key " \ + "bindings, known as \"hotkeys\"." ) #define FULLSCREEN_KEY_TEXT N_("Fullscreen") -#define FULLSCREEN_KEY_LONGTEXT N_("Select the hotkey to use to swap fullscreen state") +#define FULLSCREEN_KEY_LONGTEXT N_("Select the hotkey to use to swap fullscreen state.") #define PLAY_PAUSE_KEY_TEXT N_("Play/Pause") -#define PLAY_PAUSE_KEY_LONGTEXT N_("Select the hotkey to use to swap paused state") +#define PLAY_PAUSE_KEY_LONGTEXT N_("Select the hotkey to use to swap paused state.") #define PAUSE_KEY_TEXT N_("Pause only") -#define PAUSE_KEY_LONGTEXT N_("Select the hotkey to use to pause") +#define PAUSE_KEY_LONGTEXT N_("Select the hotkey to use to pause.") #define PLAY_KEY_TEXT N_("Play only") -#define PLAY_KEY_LONGTEXT N_("Select the hotkey to use to play") +#define PLAY_KEY_LONGTEXT N_("Select the hotkey to use to play.") #define FASTER_KEY_TEXT N_("Faster") -#define FASTER_KEY_LONGTEXT N_("Select the hotkey to use for fast forward playback") +#define FASTER_KEY_LONGTEXT N_("Select the hotkey to use for fast forward playback.") #define SLOWER_KEY_TEXT N_("Slower") -#define SLOWER_KEY_LONGTEXT N_("Select the hotkey to use for slow motion playback") +#define SLOWER_KEY_LONGTEXT N_("Select the hotkey to use for slow motion playback.") #define NEXT_KEY_TEXT N_("Next") -#define NEXT_KEY_LONGTEXT N_("Select the hotkey to use to skip to the next item in the playlist") +#define NEXT_KEY_LONGTEXT N_("Select the hotkey to use to skip to the next item in the playlist.") #define PREV_KEY_TEXT N_("Previous") -#define PREV_KEY_LONGTEXT N_("Select the hotkey to use to skip to the previous item in the playlist") +#define PREV_KEY_LONGTEXT N_("Select the hotkey to use to skip to the previous item in the playlist.") #define STOP_KEY_TEXT N_("Stop") -#define STOP_KEY_LONGTEXT N_("Select the hotkey to stop the playback") +#define STOP_KEY_LONGTEXT N_("Select the hotkey to stop the playback.") #define POSITION_KEY_TEXT N_("Position") -#define POSITION_KEY_LONGTEXT N_("Select the hotkey to display the position") +#define POSITION_KEY_LONGTEXT N_("Select the hotkey to display the position.") -#define JB10SEC_KEY_TEXT N_("Jump backward 10 seconds") -#define JB10SEC_KEY_LONGTEXT N_("Select the hotkey to jump backward by 10 seconds") +#define JB10SEC_KEY_TEXT N_("Jump 10 seconds backwards") +#define JB10SEC_KEY_LONGTEXT N_("Select the hotkey to jump 10 seconds backwards.") -#define JB1MIN_KEY_TEXT N_("Jump backward 1 minute") -#define JB1MIN_KEY_LONGTEXT N_("Select the hotkey to jump backward by 1 minute") -#define JB5MIN_KEY_TEXT N_("Jump backward 5 minutes") -#define JB5MIN_KEY_LONGTEXT N_("Select the hotkey to jump backward by 5 minutes") -#define JF10SEC_KEY_TEXT N_("Jump forward 10 seconds") -#define JF10SEC_KEY_LONGTEXT N_("Select the hotkey to jump forward by 10 seconds") +#define JB1MIN_KEY_TEXT N_("Jump 1 minute backwards") +#define JB1MIN_KEY_LONGTEXT N_("Select the hotkey to jump 1 minute backwards.") +#define JB5MIN_KEY_TEXT N_("Jump 5 minutes backwards") +#define JB5MIN_KEY_LONGTEXT N_("Select the hotkey to jump 5 minutes backwards.") +#define JF10SEC_KEY_TEXT N_("Jump 10 seconds forward") +#define JF10SEC_KEY_LONGTEXT N_("Select the hotkey to jump 10 seconds forward.") -#define JF1MIN_KEY_TEXT N_("Jump forward 1 minute") -#define JF1MIN_KEY_LONGTEXT N_("Select the hotkey to jump forward by 1 minute") +#define JF1MIN_KEY_TEXT N_("Jump 1 minute forward") +#define JF1MIN_KEY_LONGTEXT N_("Select the hotkey to jump 1 minute forward.") -#define JF5MIN_KEY_TEXT N_("Jump forward 5 minutes") -#define JF5MIN_KEY_LONGTEXT N_("Select the hotkey to jump forward by 5 minutes") +#define JF5MIN_KEY_TEXT N_("Jump 5 minutes forward") +#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 turn up audio volume") +#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 turn down audio volume") +#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") +#define PLAY_BOOKMARK4_KEY_TEXT N_("Play playlist bookmark 4") +#define PLAY_BOOKMARK5_KEY_TEXT N_("Play playlist bookmark 5") +#define PLAY_BOOKMARK6_KEY_TEXT N_("Play playlist bookmark 6") +#define PLAY_BOOKMARK7_KEY_TEXT N_("Play playlist bookmark 7") +#define PLAY_BOOKMARK8_KEY_TEXT N_("Play playlist bookmark 8") +#define PLAY_BOOKMARK9_KEY_TEXT N_("Play playlist bookmark 9") +#define PLAY_BOOKMARK10_KEY_TEXT N_("Play playlist bookmark 10") +#define PLAY_BOOKMARK_KEY_LONGTEXT N_("Select the key to play this bookmark.") +#define SET_BOOKMARK1_KEY_TEXT N_("Set playlist bookmark 1") +#define SET_BOOKMARK2_KEY_TEXT N_("Set playlist bookmark 2") +#define SET_BOOKMARK3_KEY_TEXT N_("Set playlist bookmark 3") +#define SET_BOOKMARK4_KEY_TEXT N_("Set playlist bookmark 4") +#define SET_BOOKMARK5_KEY_TEXT N_("Set playlist bookmark 5") +#define SET_BOOKMARK6_KEY_TEXT N_("Set playlist bookmark 6") +#define SET_BOOKMARK7_KEY_TEXT N_("Set playlist bookmark 7") +#define SET_BOOKMARK8_KEY_TEXT N_("Set playlist bookmark 8") +#define SET_BOOKMARK9_KEY_TEXT N_("Set playlist bookmark 9") +#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][@raw_device][@[title][,[chapter][,angle]]]" \ "\n DVD device" \ - "\n [vcd:][device][@[title][,[chapter]]" \ + "\n [vcd://][device][@{S|T|E|P}[number]]" \ "\n VCD device" \ - "\n udpstream:[@[][:]]" \ + "\n [cdda://][device][@[T][track-number]]" \ + "\n Audio CD device" \ + "\n udpstream:[[]@[][:]]" \ "\n UDP stream sent by a streaming server" \ "\n vlc:pause pause execution of " \ "playlist items" \ @@ -598,15 +710,18 @@ static char *ppsz_language_text[] = /* * Quick usage guide for the configuration options: * - * add_category_hint( N_(text), N_(longtext) ); - * add_subcategory_hint( N_(text), N_(longtext) ); - * add_usage_hint( N_(text) ); - * add_string( option_name, value, p_callback, N_(text), N_(longtext) ); + * add_category_hint( N_(text), N_(longtext), b_advanced_option ); + * add_subcategory_hint( N_(text), N_(longtext), b_advanced_option ); + * add_usage_hint( N_(text), b_advanced_option ); + * add_string( option_name, value, p_callback, N_(text), N_(longtext), + b_advanced_option ); * add_file( option_name, psz_value, p_callback, N_(text), N_(longtext) ); * add_module( option_name, psz_value, i_capability, p_callback, * N_(text), N_(longtext) ); - * add_integer( option_name, i_value, p_callback, N_(text), N_(longtext) ); - * add_bool( option_name, b_value, p_callback, 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), + b_advanced_option ); */ vlc_module_begin(); @@ -650,13 +765,12 @@ vlc_module_begin(); 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 ); -#if 0 - add_bool( "headphone-opt", 0, NULL, HEADPHONE_TEXT, - HEADPHONE_LONGTEXT, VLC_FALSE ); -#endif 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 ); @@ -666,7 +780,12 @@ 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 ); add_bool( "grayscale", 0, NULL, GRAYSCALE_TEXT, GRAYSCALE_LONGTEXT, VLC_TRUE ); add_bool( "fullscreen", 0, NULL, FULLSCREEN_TEXT, @@ -701,26 +820,53 @@ vlc_module_begin(); 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_TRUE ); + INPUT_CHAN_TEXT, INPUT_CHAN_LONGTEXT, VLC_FALSE ); add_integer( "spu-channel", -1, NULL, - INPUT_SUBT_TEXT, INPUT_SUBT_LONGTEXT, VLC_TRUE ); + INPUT_SUBT_TEXT, INPUT_SUBT_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 ); - - - 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( "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 ); @@ -757,6 +903,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 ); @@ -783,11 +930,15 @@ vlc_module_begin(); 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", 0, NULL, WIN9X_CV_TEXT, WIN9X_CV_LONGTEXT, VLC_TRUE ); + add_integer( "win9x-cv-method", 1, NULL, WIN9X_CV_TEXT, WIN9X_CV_LONGTEXT, VLC_TRUE ); #endif /* Hotkey options*/ @@ -802,7 +953,7 @@ vlc_module_begin(); 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", KEY_MODIFIER_COMMAND|'t', NULL, POSITION_KEY_TEXT, POSITION_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 ); @@ -817,6 +968,31 @@ vlc_module_begin(); 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-subdelay-up", KEY_MODIFIER_COMMAND|'j', NULL, + SUBDELAY_UP_KEY_TEXT, SUBDELAY_UP_KEY_LONGTEXT, VLC_FALSE ); + add_key( "key-subdelay-down", KEY_MODIFIER_COMMAND|'h', NULL, + SUBDELAY_DOWN_KEY_TEXT, SUBDELAY_DOWN_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 ); #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 ); @@ -842,6 +1018,31 @@ vlc_module_begin(); 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-subdelay-up", KEY_MODIFIER_COMMAND|'h', NULL, + SUBDELAY_UP_KEY_TEXT, SUBDELAY_UP_KEY_LONGTEXT, VLC_FALSE ); + add_key( "key-subdelay-down", KEY_MODIFIER_COMMAND|'j', NULL, + SUBDELAY_DOWN_KEY_TEXT, SUBDELAY_DOWN_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 ); #endif /* Usage (mainly useful for cmd line stuff) */ @@ -900,10 +1101,33 @@ static struct hotkey p_hotkeys[] = { "key-fullscreen", ACTIONID_FULLSCREEN, 0 }, { "key-vol-up", ACTIONID_VOL_UP, 0 }, { "key-vol-down", ACTIONID_VOL_DOWN, 0 }, + { "key-vol-mute", ACTIONID_VOL_MUTE, 0 }, + { "key-subdelay-down", ACTIONID_SUBDELAY_DOWN, 0 }, + { "key-subdelay-up", ACTIONID_SUBDELAY_UP, 0 }, { "key-nav-activate", ACTIONID_NAV_ACTIVATE, 0 }, { "key-nav-up", ACTIONID_NAV_UP, 0 }, { "key-nav-down", ACTIONID_NAV_DOWN, 0 }, { "key-nav-left", ACTIONID_NAV_LEFT, 0 }, { "key-nav-right", ACTIONID_NAV_RIGHT, 0 }, + { "key-set-bookmark1", ACTIONID_SET_BOOKMARK1, 0}, + { "key-set-bookmark2", ACTIONID_SET_BOOKMARK2, 0}, + { "key-set-bookmark3", ACTIONID_SET_BOOKMARK3, 0}, + { "key-set-bookmark4", ACTIONID_SET_BOOKMARK4, 0}, + { "key-set-bookmark5", ACTIONID_SET_BOOKMARK5, 0}, + { "key-set-bookmark6", ACTIONID_SET_BOOKMARK6, 0}, + { "key-set-bookmark7", ACTIONID_SET_BOOKMARK7, 0}, + { "key-set-bookmark8", ACTIONID_SET_BOOKMARK8, 0}, + { "key-set-bookmark9", ACTIONID_SET_BOOKMARK9, 0}, + { "key-set-bookmark10", ACTIONID_SET_BOOKMARK10, 0}, + { "key-play-bookmark1", ACTIONID_PLAY_BOOKMARK1, 0}, + { "key-play-bookmark2", ACTIONID_PLAY_BOOKMARK2, 0}, + { "key-play-bookmark3", ACTIONID_PLAY_BOOKMARK3, 0}, + { "key-play-bookmark4", ACTIONID_PLAY_BOOKMARK4, 0}, + { "key-play-bookmark5", ACTIONID_PLAY_BOOKMARK5, 0}, + { "key-play-bookmark6", ACTIONID_PLAY_BOOKMARK6, 0}, + { "key-play-bookmark7", ACTIONID_PLAY_BOOKMARK7, 0}, + { "key-play-bookmark8", ACTIONID_PLAY_BOOKMARK8, 0}, + { "key-play-bookmark9", ACTIONID_PLAY_BOOKMARK9, 0}, + { "key-play-bookmark10", ACTIONID_PLAY_BOOKMARK10, 0}, { NULL, 0, 0 } };