X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.h;h=23c83ed166fa6044359bc1e4684e6c7836618f56;hb=db294cb081d257ad1c8766ac22ddcf2a857bf42b;hp=164335be54b56fd6673a857a5b957d2a0241dd03;hpb=c28682f6ad82acc4771bc4a393cb25dd97f651c9;p=vlc diff --git a/src/libvlc.h b/src/libvlc.h index 164335be54..23c83ed166 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.94 2003/10/08 19:40:42 gbazin Exp $ + * $Id: libvlc.h,v 1.127 2003/12/24 12:38:04 gbazin Exp $ * * Authors: Vincent Seguin * Samuel Hocevar @@ -26,8 +26,14 @@ #define Nothing here, this is just to prevent update-po from being stupid #include "vlc_keys.h" -static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it", "ja", - "nl", "no", "pl", "pt_BR", "ru", "sv", NULL }; +static char *ppsz_language[] = +{ "auto", "en", "en_GB", "es", "de", + "fr", "hu", "it", "ja", "nl", "no", + "pl", "pt_BR", "ru", "sv" }; +static char *ppsz_language_text[] = +{ N_("Auto"), N_("American"), N_("British"), N_("Spanish"), N_("German"), + N_("French"), N_("Hungarian"), N_("Italian"), N_("Japanese"), N_("Dutch"), N_("Norwegian"), + N_("Polish"), N_("Brazilian"), N_("Russian"), N_("Swedish") }; /***************************************************************************** * Configuration options for the main program. Each module will also separatly @@ -92,7 +98,7 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it", "ja", #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 " \ - "postprocessing or visual effects (spectrum analyser,...).\n" \ + "postprocessing or visual effects (spectrum analyzer, ...).\n" \ "To tune these filters, have a look at the \"audio filter\" " \ "plugin options.") @@ -136,7 +142,7 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it", "ja", "This option allows you to delay the audio output. 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_("Choose 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 " \ @@ -149,17 +155,15 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it", "ja", #define AUDIO_FILTER_TEXT N_("Audio filters") #define AUDIO_FILTER_LONGTEXT N_( \ - "This allows you to add audio postprocessing filters, to modify" \ + "This allows you to add audio postprocessing filters, to modify " \ "the sound.") -#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 " \ + "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.") #define VOUT_CAT_LONGTEXT N_( \ "These options allow you to modify options related to " \ @@ -215,11 +219,19 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it", "ja", "If enabled, VLC will try to take advantage of the overlay capabilities " \ "of your graphics card.") +#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" ) + #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_( \ + "You can disable the messages VLC creates in the video.") + #define FILTER_TEXT N_("Video filter module") #define FILTER_LONGTEXT N_( \ "This will allow you to add a post-processing filter to enhance the " \ @@ -245,7 +257,15 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it", "ja", "1.3333, etc.) expressing pixel squareness.") #endif -#define INPUT_CAT_LONGTEXT N_( " " ) +#define INPUT_CAT_LONGTEXT N_( \ + "These options allow you to modify options related to the input " \ + "modules, 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_( \ + "When using the PVR input (or a very irregular source), you should " \ + "set this to 10000.") #define SERVER_PORT_TEXT N_("Server port") #define SERVER_PORT_LONGTEXT N_( \ @@ -291,6 +311,16 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it", "ja", "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 " \ + "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" + #define SUB_FILE_TEXT N_("Use subtitle file") #define SUB_FILE_LONGTEXT \ "Load this subtitle file. To be used when autodetect cannot detect " \ @@ -307,8 +337,24 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it", "ja", #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_("Audio CD device") +#ifdef HAVE_CDDAX +#define CDAUDIO_DEV_LONGTEXT N_( \ + "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_( \ @@ -325,24 +371,16 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it", "ja", "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 codec list") +#define CODEC_TEXT N_("Choose preferred codecs list") #define CODEC_LONGTEXT N_( \ - "This allows you to select the order in which VLC will choose its " \ - "codecs. For instance, 'a52old,a52,any' will try the old a52 codec " \ - "before the new one. Please be aware that VLC does not make any " \ - "difference between audio or video codecs, so you should always specify " \ - "'any' at the end of the list to make sure there is a fallback for the " \ - "types you didn't specify.") + "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_VIDEO_TEXT N_("Choose preferred video encoder list") -#define ENCODER_VIDEO_LONGTEXT N_( \ - "This allows you to select the order in which VLC will choose its " \ - "codecs. " ) -#define ENCODER_AUDIO_TEXT N_("Choose preferred audio encoder list") -#define ENCODER_AUDIO_LONGTEXT N_( \ - "This allows you to select the order in which VLC will choose its " \ - "codecs. " ) +#define ENCODER_TEXT N_("Choose preferred encoders list") +#define ENCODER_LONGTEXT N_( \ + "This allows you to select a list of encoders that VLC will use in " \ + "priority") #define SOUT_CAT_LONGTEXT N_( \ "These options allow you to set default global options for the " \ @@ -352,6 +390,10 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it", "ja", #define SOUT_LONGTEXT N_( \ "Empty if no stream output.") +#define SOUT_ALL_TEXT N_("Enable streaming of all ES") +#define SOUT_ALL_LONGTEXT N_( \ + "This allows you to stream all ES (video, audio and subtitles)") + #define SOUT_DISPLAY_TEXT N_("Display while streaming") #define SOUT_DISPLAY_LONGTEXT N_( \ "This allows you to play the stream while streaming it.") @@ -415,8 +457,8 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it", "ja", "advantage of them.") #define PLAYLIST_CAT_LONGTEXT N_( \ - "These options define the behaviour of the playlist. Some " \ - "of them can be overriden in the playlist dialog box." ) + "These options define the behavior of the playlist. Some " \ + "of them can be overriden in the playlist dialog box." ) #define RANDOM_TEXT N_("Play files randomly forever") #define RANDOM_LONGTEXT N_( \ @@ -427,7 +469,7 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it", "ja", #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 playlistitem") #define REPEAT_LONGTEXT N_( \ "When this is active VLC will keep playing the current playlistitem " \ @@ -450,6 +492,17 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it", "ja", #define DEMUX_LONGTEXT N_( \ "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_LONGTEXT N_( \ + "Running VLC in real-time priority will allow for much more precise " \ + "scheduling and yield better, especially when streaming content. " \ + "It can however lock up your whole machine, or make it very very " \ + "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 ONEINSTANCE_TEXT N_("Allow only one running instance of VLC") #define ONEINSTANCE_LONGTEXT N_( \ "Allowing only one running instance of VLC can sometimes be useful, " \ @@ -477,19 +530,20 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it", "ja", #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 PLAY_PAUSE_KEY_TEXT N_("Pause") +#define PLAY_PAUSE_KEY_TEXT N_("Play/Pause") #define PLAY_PAUSE_KEY_LONGTEXT N_("Select the hotkey to use to swap paused state") #define PAUSE_KEY_TEXT N_("Pause only") #define PAUSE_KEY_LONGTEXT N_("Select the hotkey to use to pause") @@ -505,6 +559,25 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it", "ja", #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 POSITION_KEY_TEXT N_("Position") +#define POSITION_KEY_LONGTEXT N_("Select the hotkey to display the position") + +#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 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 1 minute forward") +#define JF1MIN_KEY_LONGTEXT N_("Select the hotkey to jump 1 minute forward") + +#define JF5MIN_KEY_TEXT N_("Jump 5 minutes forward") +#define JF5MIN_KEY_LONGTEXT N_("Select the hotkey to jump 5 minutes forward") + #define QUIT_KEY_TEXT N_("Quit") #define QUIT_KEY_LONGTEXT N_("Select the hotkey to quit the application") #define NAV_UP_KEY_TEXT N_("Navigate up") @@ -521,6 +594,30 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it", "ja", #define VOL_UP_KEY_LONGTEXT N_("Select the key to turn up 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_MUTE_KEY_TEXT N_("Mute") +#define VOL_MUTE_KEY_LONGTEXT N_("Select the key to turn off audio volume") +#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" \ @@ -553,28 +650,32 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it", "ja", vlc_module_begin(); /* Interface options */ add_category_hint( N_("Interface"), INTF_CAT_LONGTEXT , VLC_FALSE ); - add_module_with_short( "intf", 'I', "interface", NULL, NULL, - INTF_TEXT, INTF_LONGTEXT, VLC_TRUE ); - add_string( "extraintf", NULL, NULL, EXTRAINTF_TEXT, + 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_with_short( "verbose", 'v', 0, NULL, - VERBOSE_TEXT, VERBOSE_LONGTEXT, VLC_FALSE ); - add_bool_with_short( "quiet", 'q', 0, NULL, QUIET_TEXT, - QUIET_LONGTEXT, VLC_TRUE ); - add_string_from_list( "language", "auto", ppsz_language, NULL, - LANGUAGE_TEXT, LANGUAGE_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, + add_bool( "advanced", 0, NULL, ADVANCED_TEXT, ADVANCED_LONGTEXT, VLC_FALSE ); - add_directory( "search-path", NULL, NULL, INTF_PATH_TEXT, + add_directory( "search-path", NULL, NULL, INTF_PATH_TEXT, INTF_PATH_LONGTEXT, VLC_TRUE ); add_directory( "plugin-path", NULL, NULL, PLUGIN_PATH_TEXT, PLUGIN_PATH_LONGTEXT, VLC_TRUE ); /* Audio options */ add_category_hint( N_("Audio"), AOUT_CAT_LONGTEXT , VLC_FALSE ); - add_module_with_short( "aout", 'A', "audio output", NULL, NULL, - AOUT_TEXT, AOUT_LONGTEXT, VLC_TRUE); + 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, @@ -586,32 +687,35 @@ vlc_module_begin(); #if !defined( SYS_DARWIN ) add_bool( "hq-resampling", 1, NULL, AOUT_RESAMP_TEXT, AOUT_RESAMP_LONGTEXT, VLC_TRUE ); #endif - add_integer( "desync", 0, NULL, DESYNC_TEXT, DESYNC_LONGTEXT, VLC_TRUE ); 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 ); - add_module_with_short( "vout", 'V', "video output", NULL, NULL, - VOUT_TEXT, VOUT_LONGTEXT, VLC_TRUE ); + add_module( "vout", "video output", NULL, NULL, VOUT_TEXT, VOUT_LONGTEXT, + VLC_TRUE ); + change_short('V'); 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( "align", -1, NULL, ALIGN_TEXT, ALIGN_LONGTEXT, VLC_TRUE ); + add_integer( "align", 0, NULL, ALIGN_TEXT, ALIGN_LONGTEXT, VLC_TRUE ); 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, + 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_integer( "spumargin", -1, NULL, SPUMARGIN_TEXT, + + 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, FILTER_TEXT, FILTER_LONGTEXT, VLC_FALSE ); add_string( "aspect-ratio", "", NULL, @@ -622,6 +726,8 @@ vlc_module_begin(); /* 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 ); @@ -637,37 +743,44 @@ vlc_module_begin(); INPUT_SUBT_TEXT, INPUT_SUBT_LONGTEXT, VLC_TRUE ); 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_bool_with_short( "ipv6", '6', 0, NULL, IPV6_TEXT, IPV6_LONGTEXT, VLC_FALSE ); - add_bool_with_short( "ipv4", '4', 0, NULL, IPV4_TEXT, IPV4_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'); /* 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 ); /* Stream output options */ 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, + add_bool( "sout-display", VLC_FALSE, NULL, SOUT_DISPLAY_TEXT, SOUT_DISPLAY_LONGTEXT, VLC_TRUE ); - add_bool( "sout-keep", VLC_FALSE, NULL, SOUT_KEEP_TEXT, + add_bool( "sout-keep", VLC_FALSE, NULL, SOUT_KEEP_TEXT, SOUT_KEEP_LONGTEXT, VLC_TRUE ); - - add_bool( "sout-audio", 1, NULL, SOUT_AUDIO_TEXT, + add_bool( "sout-all", 0, NULL, SOUT_ALL_TEXT, + SOUT_ALL_LONGTEXT, VLC_TRUE ); + add_bool( "sout-audio", 1, NULL, SOUT_AUDIO_TEXT, SOUT_AUDIO_LONGTEXT, VLC_TRUE ); - add_bool( "sout-video", 1, NULL, SOUT_VIDEO_TEXT, + add_bool( "sout-video", 1, NULL, SOUT_VIDEO_TEXT, SOUT_VIDEO_LONGTEXT, VLC_TRUE ); add_module( "packetizer", "packetizer", NULL, NULL, PACKETIZER_TEXT, PACKETIZER_LONGTEXT, VLC_TRUE ); - add_module( "mux", "sout mux", NULL, NULL, MUX_TEXT, + add_module( "mux", "sout mux", NULL, NULL, MUX_TEXT, MUX_LONGTEXT, VLC_TRUE ); add_module( "access_output", "sout access", NULL, NULL, ACCESS_OUTPUT_TEXT, ACCESS_OUTPUT_LONGTEXT, VLC_TRUE ); @@ -688,9 +801,12 @@ vlc_module_begin(); /* Playlist options */ add_category_hint( N_("Playlist"), PLAYLIST_CAT_LONGTEXT , VLC_FALSE ); - add_bool_with_short( "random", 'Z', 0, NULL, RANDOM_TEXT, RANDOM_LONGTEXT, VLC_FALSE ); - add_bool_with_short( "loop", 'L', 0, NULL, LOOP_TEXT, LOOP_LONGTEXT, VLC_FALSE ); - add_bool_with_short( "repeat", 'R', 0, NULL, REPEAT_TEXT, REPEAT_LONGTEXT, VLC_TRUE ); + 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 */ add_category_hint( N_("Miscellaneous"), MISC_CAT_LONGTEXT, VLC_TRUE ); @@ -698,32 +814,114 @@ vlc_module_begin(); add_module( "access", "access", NULL, NULL, ACCESS_TEXT, ACCESS_LONGTEXT, VLC_TRUE ); add_module( "demux", "demux", NULL, NULL, DEMUX_TEXT, DEMUX_LONGTEXT, VLC_TRUE ); + add_bool( "minimize-threads", 0, NULL, MINIMIZE_THREADS_TXT, MINIMIZE_THREADS_LONGTXT, VLC_TRUE ); + +#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 ); +#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*/ add_category_hint( N_("Hot keys"), HOTKEY_CAT_LONGTEXT , VLC_FALSE ); - add_key( "fullscreen-key", 'f', NULL, FULLSCREEN_KEY_TEXT, FULLSCREEN_KEY_LONGTEXT, VLC_FALSE ); - add_key( "play-pause-key", KEY_SPACE, NULL, PLAY_PAUSE_KEY_TEXT, PLAY_PAUSE_KEY_LONGTEXT, VLC_FALSE ); - add_key( "pause-key", 0, NULL, PAUSE_KEY_TEXT, PAUSE_KEY_LONGTEXT, VLC_TRUE ); - add_key( "play-key", 0, NULL, PLAY_KEY_TEXT, PLAY_KEY_LONGTEXT, VLC_TRUE ); - add_key( "faster-key", '+', NULL, FASTER_KEY_TEXT, FASTER_KEY_LONGTEXT, VLC_FALSE ); - add_key( "slower-key", '-', NULL, SLOWER_KEY_TEXT, SLOWER_KEY_LONGTEXT, VLC_FALSE ); - add_key( "next-key", 'n', NULL, NEXT_KEY_TEXT, NEXT_KEY_LONGTEXT, VLC_FALSE ); - add_key( "prev-key", 'p', NULL, PREV_KEY_TEXT, PREV_KEY_LONGTEXT, VLC_FALSE ); - add_key( "stop-key", 's', NULL, STOP_KEY_TEXT, STOP_KEY_LONGTEXT, VLC_FALSE ); - add_key( "nav-activate-key", KEY_ENTER, NULL, NAV_ACTIVATE_KEY_TEXT, NAV_ACTIVATE_KEY_LONGTEXT, VLC_FALSE ); - add_key( "nav-up-key", KEY_UP, NULL, NAV_UP_KEY_TEXT, NAV_UP_KEY_LONGTEXT, VLC_FALSE ); - add_key( "nav-down-key", KEY_DOWN, NULL, NAV_DOWN_KEY_TEXT, NAV_DOWN_KEY_LONGTEXT, VLC_FALSE ); - add_key( "nav-left-key", KEY_LEFT, NULL, NAV_LEFT_KEY_TEXT, NAV_LEFT_KEY_LONGTEXT, VLC_FALSE ); - add_key( "nav-right-key", KEY_RIGHT, NULL, NAV_RIGHT_KEY_TEXT, NAV_RIGHT_KEY_LONGTEXT, VLC_FALSE ); - add_key( "quit-key", KEY_MODIFIER_CTRL|KEY_SPACE, NULL, QUIT_KEY_TEXT, QUIT_KEY_LONGTEXT, VLC_FALSE ); - add_key( "vol-up-key", 'a', NULL, VOL_UP_KEY_TEXT, VOL_UP_KEY_LONGTEXT, VLC_FALSE ); - add_key( "vol-down-key", 'z', NULL, VOL_DOWN_KEY_TEXT, VOL_DOWN_KEY_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 ); +#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 ); +#endif /* Usage (mainly useful for cmd line stuff) */ add_usage_hint( PLAYLIST_USAGE ); @@ -756,3 +954,56 @@ static module_config_t p_help_config[] = /***************************************************************************** * End configuration. *****************************************************************************/ + +/***************************************************************************** + * Initializer for the vlc_t structure storing the action / key associations + *****************************************************************************/ +static struct hotkey p_hotkeys[] = +{ + { "key-quit", ACTIONID_QUIT, 0 }, + { "key-play-pause", ACTIONID_PLAY_PAUSE, 0 }, + { "key-play", ACTIONID_PLAY, 0 }, + { "key-pause", ACTIONID_PAUSE, 0 }, + { "key-stop", ACTIONID_STOP, 0 }, + { "key-position", ACTIONID_POSITION, 0 }, + { "key-jump-10sec", ACTIONID_JUMP_BACKWARD_10SEC, 0 }, + { "key-jump+10sec", ACTIONID_JUMP_FORWARD_10SEC, 0 }, + { "key-jump-1min", ACTIONID_JUMP_BACKWARD_1MIN, 0 }, + { "key-jump+1min", ACTIONID_JUMP_FORWARD_1MIN, 0 }, + { "key-jump-5min", ACTIONID_JUMP_BACKWARD_5MIN, 0 }, + { "key-jump+5min", ACTIONID_JUMP_FORWARD_5MIN, 0 }, + { "key-prev", ACTIONID_PREV, 0 }, + { "key-next", ACTIONID_NEXT, 0 }, + { "key-faster", ACTIONID_FASTER, 0 }, + { "key-slower", ACTIONID_SLOWER, 0 }, + { "key-fullscreen", ACTIONID_FULLSCREEN, 0 }, + { "key-vol-up", ACTIONID_VOL_UP, 0 }, + { "key-vol-down", ACTIONID_VOL_DOWN, 0 }, + { "key-vol-mute", ACTIONID_VOL_MUTE, 0 }, + { "key-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 } +};