X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.h;h=ab6d64eed9fe7641a478ee2dab6b92f6bbafab13;hb=a8f3c4cad2e3ff540726d0526b014d79e11963ae;hp=2ae4c3dfca7df6b2c432bf4a6977413bcc0eee61;hpb=21c4f10c6e9615cdd597b0639102d6ecf7be088d;p=vlc diff --git a/src/libvlc.h b/src/libvlc.h index 2ae4c3dfca..ab6d64eed9 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.87 2003/09/22 03:40:06 hartman Exp $ + * $Id: libvlc.h,v 1.107 2003/11/16 21:07:31 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", "es", "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_("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") }; /***************************************************************************** * Configuration options for the main program. Each module will also separatly @@ -35,9 +41,15 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "es", "de", "fr", "it", * Look into configuration.h if you need to know more about the following * macros. *****************************************************************************/ + +#define INTF_CAT_LONGTEXT N_( \ + "These options allow you to configure the interfaces used by VLC.\n" \ + "You can select the main interface, additional " \ + "interface modules, and define various related options." ) + #define INTF_TEXT N_("Interface module") #define INTF_LONGTEXT N_( \ - "This option allows you to select the interface used by VLC. " \ + "This option allows you to select the interface used by VLC.\n" \ "The default behavior is to automatically select the best module " \ "available.") @@ -83,6 +95,13 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "es", "de", "fr", "it", "This option allows you to specify an additional path for VLC to look " \ "for its plugins.") +#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" \ + "To tune these filters, have a look at the \"audio filter\" " \ + "plugin options.") + #define AOUT_TEXT N_("Audio output module") #define AOUT_LONGTEXT N_( \ "This option allows you to select the audio output method used by VLC. " \ @@ -136,7 +155,7 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "es", "de", "fr", "it", #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") @@ -148,6 +167,13 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "es", "de", "fr", "it", "long periods of time.\nIt works with any source format from mono " \ "to 5.1.") +#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." ) #define VOUT_TEXT N_("Video output module") #define VOUT_LONGTEXT N_( \ @@ -200,6 +226,10 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "es", "de", "fr", "it", "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 " \ @@ -225,6 +255,8 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "es", "de", "fr", "it", "1.3333, etc.) expressing pixel squareness.") #endif +#define INPUT_CAT_LONGTEXT N_( " " ) + #define SERVER_PORT_TEXT N_("Server port") #define SERVER_PORT_LONGTEXT N_( \ "This is the port used for UDP streams. By default, we chose 1234.") @@ -266,8 +298,18 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "es", "de", "fr", "it", #define SUB_AUTO_TEXT N_("Autodetect subtitle files") #define SUB_AUTO_LONGTEXT \ - "Automatically detect a subtitle file, if no subtitle filename is" \ - "is specified." + "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 \ @@ -298,23 +340,25 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "es", "de", "fr", "it", "If you check this box, IPv4 will be used by default for all UDP and " \ "HTTP connections.") -#define CODEC_TEXT N_("Choose preferred codec list") +#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_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.") - -#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. " ) + "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_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 " \ + "stream output subsystem." ) #define SOUT_TEXT N_("Choose a stream output") #define SOUT_LONGTEXT N_( \ @@ -353,6 +397,9 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "es", "de", "fr", "it", #define ACCESS_OUTPUT_LONGTEXT N_( \ "This is a legacy entry to let you configure access output modules") +#define CPU_CAT_LONGTEXT N_( \ + "These options allow you to enable special CPU optimizations.\n" \ + "You should always leave all these enabled." ) #define MMX_TEXT N_("Enable CPU MMX support") #define MMX_LONGTEXT N_( \ @@ -379,6 +426,10 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "es", "de", "fr", "it", "If your processor supports the AltiVec instructions set, VLC can take " \ "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." ) + #define RANDOM_TEXT N_("Play files randomly forever") #define RANDOM_LONGTEXT N_( \ "When selected, VLC will randomly play files in the playlist until " \ @@ -394,6 +445,10 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "es", "de", "fr", "it", "When this is active VLC will keep playing the current playlistitem " \ "over and over again.") +#define MISC_CAT_LONGTEXT N_( \ + "These options allow you to select default modules. Leave these " \ + "alone unless you really know what you are doing." ) + #define MEMCPY_TEXT N_("Memory copy module") #define MEMCPY_LONGTEXT N_( \ "You can select which memory copy module you want to use. By default " \ @@ -407,6 +462,22 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "es", "de", "fr", "it", #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 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, " \ + "for instance if you associated VLC with some media types and you " \ + "don't want a new instance of VLC to be opened each time you " \ + "double-click on a file in the explorer. This option will allow you " \ + "to play the file with the already running instance or enqueue it.") + #define HPRIORITY_TEXT N_("Increase the priority of the process") #define HPRIORITY_LONGTEXT N_( \ "Increasing the priority of the process will very likely improve your " \ @@ -434,9 +505,11 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "es", "de", "fr", "it", "Currently you can choose between implementation 0 (which is the " \ "default and the fastest), 1 and 2.") +#define HOTKEY_CAT_LONGTEXT N_( " " ) + #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") @@ -452,6 +525,23 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "es", "de", "fr", "it", #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 JB10SEC_KEY_TEXT N_("Jump backward 10 seconds") +#define JB10SEC_KEY_LONGTEXT N_("Select the hotkey to jump backward by 10 seconds") + +#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 JF1MIN_KEY_TEXT N_("Jump forward 1 minute") +#define JF1MIN_KEY_LONGTEXT N_("Select the hotkey to jump forward by 1 minute") + +#define JF5MIN_KEY_TEXT N_("Jump forward 5 minutes") +#define JF5MIN_KEY_LONGTEXT N_("Select the hotkey to jump forward by 5 minutes") + #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") @@ -499,25 +589,34 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "es", "de", "fr", "it", vlc_module_begin(); /* Interface options */ - add_category_hint( N_("Interface"), NULL, VLC_FALSE ); - add_module_with_short( "intf", 'I', "interface", NULL, NULL, - INTF_TEXT, INTF_LONGTEXT, VLC_TRUE ); - add_string( "extraintf", NULL, NULL, EXTRAINTF_TEXT, EXTRAINTF_LONGTEXT, VLC_TRUE ); - 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_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_bool( "advanced", 0, NULL, ADVANCED_TEXT, + ADVANCED_LONGTEXT, VLC_FALSE ); + add_directory( "search-path", NULL, NULL, INTF_PATH_TEXT, + INTF_PATH_LONGTEXT, VLC_TRUE ); add_directory( "plugin-path", NULL, NULL, PLUGIN_PATH_TEXT, PLUGIN_PATH_LONGTEXT, VLC_TRUE ); /* Audio options */ - add_category_hint( N_("Audio"), NULL, VLC_FALSE ); - add_module_with_short( "aout", 'A', "audio output", NULL, NULL, - AOUT_TEXT, AOUT_LONGTEXT, VLC_FALSE ); - add_bool( "audio", 1, NULL, AUDIO_TEXT, AUDIO_LONGTEXT, VLC_TRUE ); + 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 ); @@ -528,29 +627,36 @@ 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 ); - add_bool( "headphone-opt", 0, NULL, HEADPHONE_TEXT, HEADPHONE_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); /* Video options */ - add_category_hint( N_("Video"), NULL, VLC_FALSE ); - add_module_with_short( "vout", 'V', "video output", NULL, NULL, - VOUT_TEXT, VOUT_LONGTEXT, VLC_FALSE ); + add_category_hint( N_("Video"), VOUT_CAT_LONGTEXT , VLC_FALSE ); + 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_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 ); + 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, SPUMARGIN_LONGTEXT, VLC_TRUE ); + 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_TRUE ); + FILTER_TEXT, FILTER_LONGTEXT, VLC_FALSE ); add_string( "aspect-ratio", "", NULL, ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, VLC_TRUE ); #if 0 @@ -558,7 +664,7 @@ vlc_module_begin(); #endif /* Input options */ - add_category_hint( N_("Input"), NULL, VLC_FALSE ); + add_category_hint( N_("Input"), INPUT_CAT_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 ); @@ -574,6 +680,8 @@ 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 ); @@ -581,33 +689,41 @@ vlc_module_begin(); 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_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"), NULL, VLC_TRUE ); + 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"), NULL, VLC_TRUE ); + 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 ); - add_bool( "sout-keep", VLC_FALSE, NULL, SOUT_KEEP_TEXT, SOUT_KEEP_LONGTEXT, VLC_TRUE ); + 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, + SOUT_KEEP_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, SOUT_VIDEO_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, + 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, MUX_LONGTEXT, VLC_TRUE ); + 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 ); add_integer( "ttl", 1, NULL, TTL_TEXT, TTL_LONGTEXT, VLC_TRUE ); /* CPU options */ - add_category_hint( N_("CPU"), NULL, VLC_TRUE ); + add_category_hint( N_("CPU"), CPU_CAT_LONGTEXT, VLC_TRUE ); #if defined( __i386__ ) add_bool( "mmx", 1, NULL, MMX_TEXT, MMX_LONGTEXT, VLC_TRUE ); add_bool( "3dn", 1, NULL, THREE_DN_TEXT, THREE_DN_LONGTEXT, VLC_TRUE ); @@ -619,42 +735,82 @@ vlc_module_begin(); #endif /* Playlist options */ - add_category_hint( N_("Playlist"), NULL, VLC_FALSE ); - add_bool_with_short( "random", 'Z', 0, NULL, RANDOM_TEXT, RANDOM_LONGTEXT, VLC_FALSE ); + 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 */ - add_category_hint( N_("Miscellaneous"), NULL, VLC_TRUE ); + 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 ); +#if !defined(SYS_DARWIN) && 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 ); #endif /* Hotkey options*/ - add_category_hint( N_("Hot keys"), NULL, 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 ); + 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-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 ); +#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-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 ); +#endif /* Usage (mainly useful for cmd line stuff) */ add_usage_hint( PLAYLIST_USAGE ); @@ -665,22 +821,56 @@ vlc_module_end(); static module_config_t p_help_config[] = { - { CONFIG_ITEM_BOOL, NULL, "help", 'h', N_("print help"), - NULL, NULL, 0, 0.0, 0, 0, 0.0, 0.0, NULL, NULL, NULL, VLC_FALSE }, - { CONFIG_ITEM_BOOL, NULL, "longhelp", 'H', N_("print detailed help"), - NULL, NULL, 0, 0.0, 0, 0, 0.0, 0.0, NULL, NULL, NULL, VLC_FALSE }, + { CONFIG_ITEM_BOOL, NULL, "help", 'h', + N_("print help (can be combined with --advanced)") }, + { CONFIG_ITEM_BOOL, NULL, "longhelp", 'H', + N_("print detailed help (can be combined with --advanced)") }, { CONFIG_ITEM_BOOL, NULL, "list", 'l', - N_("print a list of available modules"), - NULL, NULL, 0, 0.0, 0, 0, 0.0, 0.0, NULL, NULL, NULL, VLC_FALSE }, - { CONFIG_ITEM_STRING, NULL, "module", 'p', N_("print help on module"), - NULL, NULL, 0, 0.0, 0, 0, 0.0, 0.0, NULL, NULL, NULL, VLC_FALSE }, + N_("print a list of available modules") }, + { CONFIG_ITEM_STRING, NULL, "module", 'p', + N_("print help on 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, "version", '\0', - N_("print version information"), - NULL, NULL, 0, 0.0, 0, 0, 0.0, 0.0, NULL, NULL, NULL, VLC_FALSE }, - { CONFIG_HINT_END, NULL, NULL, '\0', NULL, - NULL, NULL, 0, 0.0, 0, 0, 0.0, 0.0, NULL, NULL, NULL, VLC_FALSE } + N_("print version information") }, + { CONFIG_HINT_END, NULL, NULL, '\0', NULL } }; /***************************************************************************** * 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-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-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 }, + { NULL, 0, 0 } +};