X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.h;h=16aad59e2d6fa4586738f7967a14ac1b0e131f56;hb=9549f78f20273da24d982ab8a9b8e251263710c1;hp=96e93a4839c45cc3b96ad6d1a218d82e82ea4f3c;hpb=5080ba2625e42afb3c390e32c15732842f128e1f;p=vlc diff --git a/src/libvlc.h b/src/libvlc.h index 96e93a4839..16aad59e2d 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.58 2003/05/04 23:38:06 massiot Exp $ + * $Id: libvlc.h,v 1.93 2003/10/03 23:31:43 sigmunau Exp $ * * Authors: Vincent Seguin * Samuel Hocevar @@ -24,9 +24,10 @@ *****************************************************************************/ #define Nothing here, this is just to prevent update-po from being stupid +#include "vlc_keys.h" -static char *ppsz_sout_acodec[] = { "", "mpeg1", "mpeg2", "mpeg4", "vorbis", NULL }; -static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; +static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it", "ja", + "nl", "no", "pl", "pt_BR", "ru", "sv", NULL }; /***************************************************************************** * Configuration options for the main program. Each module will also separatly @@ -34,9 +35,15 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; * 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\n" \ + "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.") @@ -44,7 +51,8 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; #define EXTRAINTF_LONGTEXT N_( \ "This option allows you to select additional interfaces used by VLC. " \ "They will be launched in the background in addition to the default " \ - "interface. Use a comma separated list of interface modules.") + "interface. Use a comma separated list of interface modules. (common " \ + "values are: logger,gestures,sap,rc,http,screensaver)") #define VERBOSE_TEXT N_("Verbosity (0,1,2)") #define VERBOSE_LONGTEXT N_( \ @@ -55,9 +63,10 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; #define QUIET_LONGTEXT N_( \ "This options turns off all warning and information messages.") -#define TRANSLATION_TEXT N_("Translation") -#define TRANSLATION_LONGTEXT N_( \ - "This option allows you to enable the translation of the interface.") +#define LANGUAGE_TEXT N_("Language") +#define LANGUAGE_LONGTEXT N_( "This option allows you to set the language " \ + "of the interface. The system language is auto-detected if \"auto\" is " \ + "specified here." ) #define COLOR_TEXT N_("Color messages") #define COLOR_LONGTEXT N_( \ @@ -66,8 +75,9 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; #define ADVANCED_TEXT N_("Show advanced options") #define ADVANCED_LONGTEXT N_( \ - "When this option is turned on, the interfaces will show all the " \ - "available options, including those that most users should never touch") + "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") #define INTF_PATH_TEXT N_("Interface default search path") #define INTF_PATH_LONGTEXT N_( \ @@ -79,6 +89,13 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; "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, \n" \ + "and to add audio filters which can be used for \n" \ + "postprocessing or visual effects (spectrum analyser,...) \n" \ + "To tune these filters, have a look at the \"audio filter\"\n" \ + "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. " \ @@ -88,7 +105,7 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; #define AUDIO_TEXT N_("Enable audio") #define AUDIO_LONGTEXT N_( \ "You can completely disable the audio output. In this case the audio " \ - "decoding stage won't be done, and it will save some processing power.") + "decoding will not take place, and it will save some processing power.") #define MONO_TEXT N_("Force mono audio") #define MONO_LONGTEXT N_("This will force a mono audio output") @@ -107,25 +124,51 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; "You can force the audio output frequency here. Common values are " \ "-1 (default), 48000, 44100, 32000, 22050, 16000, 11025, 8000.") +#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 " \ + "disable it and a cheaper resampling algorithm will be used instead.") +#endif + #define DESYNC_TEXT N_("Compensate desynchronization of audio (in ms)") #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.") +#define MULTICHA_TEXT N_("Choose prefered 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)") + #define SPDIF_TEXT N_("Use the S/PDIF audio output when available") #define SPDIF_LONGTEXT N_( \ "This option allows you to use the S/PDIF audio output by default when " \ "your hardware supports it as well as the audio stream being played.") +#define AUDIO_FILTER_TEXT N_("Audio filters") +#define AUDIO_FILTER_LONGTEXT N_( \ + "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 stands in a real room " \ + "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 VOUT_CAT_LONGTEXT N_( \ + "These options allow you to modify options related to \n" \ + "the video output subsystem. You can for example enable \n" \ + "video filters, like deinterlacing, constrast / hue / \n " \ + "saturation adjusting, ... \n" \ + "Enable these filters here and configure them in the video \n" \ + "filters plugins section." ) + #define VOUT_TEXT N_("Video output module") #define VOUT_LONGTEXT N_( \ "This option allows you to select the video output method used by VLC. " \ @@ -135,28 +178,29 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; #define VIDEO_TEXT N_("Enable video") #define VIDEO_LONGTEXT N_( \ "You can completely disable the video output. In this case the video " \ - "decoding stage won't be done, which will save some processing power.") - -#define DISPLAY_TEXT N_("Display identifier") -#define DISPLAY_LONGTEXT N_( \ - "This is the local display port that will be used for X11 drawing. " \ - "For instance :0.1.") + "decoding stage will not take place, which will save some processing power.") #define WIDTH_TEXT N_("Video width") #define WIDTH_LONGTEXT N_( \ - "You can enforce the video width here. By default VLC will " \ + "You can enforce the video width here. By default (-1) VLC will " \ "adapt to the video characteristics.") #define HEIGHT_TEXT N_("Video height") #define HEIGHT_LONGTEXT N_( \ - "You can enforce the video height here. By default VLC will " \ + "You can enforce the video height here. By default (-1) VLC will " \ "adapt to the video characteristics.") +#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).") + #define ZOOM_TEXT N_("Zoom video") #define ZOOM_LONGTEXT N_( \ "You can zoom the video by the specified factor.") -#define GRAYSCALE_TEXT N_("gGayscale video output") +#define GRAYSCALE_TEXT N_("Grayscale video output") #define GRAYSCALE_LONGTEXT N_( \ "When enabled, the color information from the video won't be decoded " \ "(this can also allow you to save some processing power).") @@ -169,7 +213,7 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; #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 graphic card.") + "of your graphics card.") #define SPUMARGIN_TEXT N_("Force SPU position") #define SPUMARGIN_LONGTEXT N_( \ @@ -201,6 +245,8 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; "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.") @@ -210,23 +256,6 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; "This is the typical size of UDP packets that we expect. On Ethernet " \ "it is usually 1500.") -#define NETCHANNEL_TEXT N_("Enable network channel mode") -#define NETCHANNEL_LONGTEXT N_( \ - "Activate this option if you want to use the VideoLAN Channel Server.") - -#define CHAN_SERV_TEXT N_("Channel server address") -#define CHAN_SERV_LONGTEXT N_( \ - "Indicate here the address of the VideoLAN Channel Server.") - -#define CHAN_PORT_TEXT N_("Channel server port") -#define CHAN_PORT_LONGTEXT N_( \ - "Indicate here the port on which the VideoLAN Channel Server runs.") - -#define IFACE_TEXT N_("Network interface") -#define IFACE_LONGTEXT N_( \ - "If you have several interfaces on your Linux machine and use the " \ - "VLAN solution, you may indicate here which interface to use.") - #define IFACE_ADDR_TEXT N_("Network interface address") #define IFACE_ADDR_LONGTEXT N_( \ "If you have several interfaces on your machine and use the " \ @@ -244,17 +273,28 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; #define INPUT_AUDIO_TEXT N_("Choose audio") #define INPUT_AUDIO_LONGTEXT N_( \ - "Give the default type of audio you want to use in a DVD.") + "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_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") +#define INPUT_SUBT_TEXT N_("Choose subtitles track") #define INPUT_SUBT_LONGTEXT N_( \ - "Give the stream number of the subtitle channel you want to use in a " \ - "DVD (from 1 to n).") + "Give the stream number of the subtitle channel you want to use " \ + "(from 1 to n).") + +#define SUB_AUTO_TEXT N_("Autodetect subtitle files") +#define SUB_AUTO_LONGTEXT \ + "Automatically detect a subtitle file, if no subtitle filename is " \ + "specified." + +#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." #define DVD_DEV_TEXT N_("DVD device") #ifdef WIN32 @@ -280,6 +320,11 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; "If you check this box, IPv4 will be used by default for all UDP and " \ "HTTP connections.") +#define CODEC_CAT_LONGTEXT N_( \ + "This option can be used to alter the way VLC selects \n" \ + "its codecs (decompression methods). Only advanced users should \n" \ + "alter this option as it can break playback of all your streams." ) + #define CODEC_TEXT N_("Choose preferred codec list") #define CODEC_LONGTEXT N_( \ "This allows you to select the order in which VLC will choose its " \ @@ -289,6 +334,7 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; "'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 " \ @@ -298,6 +344,10 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; "This allows you to select the order in which VLC will choose its " \ "codecs. " ) +#define SOUT_CAT_LONGTEXT N_( \ + "These options allow you to set default global options for the\n " \ + "stream output subsystem." ) + #define SOUT_TEXT N_("Choose a stream output") #define SOUT_LONGTEXT N_( \ "Empty if no stream output.") @@ -311,26 +361,16 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; "This allows you to choose if the video stream should be redirected to " \ "the stream output facility when this last one is enabled.") -#define SOUT_VCODEC_TEXT N_("Video encoding codec" ) -#define SOUT_VCODEC_LONGTEXT N_( \ - "This allows you to force video encoding") - -#define SOUT_VBITRATE_TEXT N_("Video bitrate encoding (kB/s)" ) -#define SOUT_VBITRATE_LONGTEXT N_( \ - "This allows you to specify video bitrate in kB/s.") - #define SOUT_AUDIO_TEXT N_("Enable audio stream output") #define SOUT_AUDIO_LONGTEXT N_( \ "This allows you to choose if the video stream should be redirected to " \ "the stream output facility when this last one is enabled.") -#define SOUT_ACODEC_TEXT N_("Audio encoding codec" ) -#define SOUT_ACODEC_LONGTEXT N_( \ - "This allows you to force audio encoding") - -#define SOUT_ABITRATE_TEXT N_("Audio bitrate encoding (kB/s)" ) -#define SOUT_ABITRATE_LONGTEXT N_( \ - "This allows you to specify audio bitrate in kB/s.") +#define SOUT_KEEP_TEXT N_("Keep sout open" ) +#define SOUT_KEEP_LONGTEXT N_( \ + "This allows you to keep an unique sout instance across " \ + "multiple playlist item (automatically insert gather stream_out " \ + "if not specified)" ) #define PACKETIZER_TEXT N_("Choose preferred packetizer list") #define PACKETIZER_LONGTEXT N_( \ @@ -345,6 +385,9 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; #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 \n " \ + "optimizations. You should always leave all these enabled." ) #define MMX_TEXT N_("Enable CPU MMX support") #define MMX_LONGTEXT N_( \ @@ -371,24 +414,28 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; "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 \n" \ + "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 " \ "interrupted.") -#define LAUNCH_TEXT N_("Launch playlist on startup") -#define LAUNCH_LONGTEXT N_( \ - "If you want VLC to start playing on startup, then enable this option.") - -#define ENQUEUE_TEXT N_("Enqueue items in playlist") -#define ENQUEUE_LONGTEXT N_( \ - "If you want VLC to add items to the playlist as you open them, then " \ - "enable this option.") - #define LOOP_TEXT N_("Loop playlist on end") #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 " \ + "over and over again.") + +#define MISC_CAT_LONGTEXT N_( \ + "These options allow you to select default modules. Leave these \n" \ + "alone unless you really know what you are doing." ) #define MEMCPY_TEXT N_("Memory copy module") #define MEMCPY_LONGTEXT N_( \ @@ -403,7 +450,24 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; #define DEMUX_LONGTEXT N_( \ "This is a legacy entry to let you configure demux modules") -#define FAST_MUTEX_TEXT N_("Dast mutex on NT/2K/XP (developers only)") +#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 " \ + "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 " \ + "all the processor time and render the whole system unresponsive which " \ + "might require a reboot of your machine.") + +#define FAST_MUTEX_TEXT N_("Fast mutex on NT/2K/XP (developers only)") #define FAST_MUTEX_LONGTEXT N_( \ "On Windows NT/2K/XP we use a slow mutex implementation but which " \ "allows us to correctely implement condition variables. " \ @@ -421,7 +485,42 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; "Currently you can choose between implementation 0 (which is the " \ "default and the fastest), 1 and 2.") -#define RT_PRIORITY_TEXT N_("Real-time priority") +#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_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 PLAY_KEY_TEXT N_("Play only") +#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 SLOWER_KEY_TEXT N_("Slower") +#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 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 STOP_KEY_TEXT N_("Stop") +#define STOP_KEY_LONGTEXT N_("Select the hotkey to stop the playback") +#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") +#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_LEFT_KEY_TEXT N_("Navigate left") +#define NAV_LEFT_KEY_LONGTEXT N_("Select the key to move the selector left in dvd menus") +#define NAV_RIGHT_KEY_TEXT N_("Navigate right") +#define NAV_RIGHT_KEY_LONGTEXT N_("Select the key to move the selector right in dvd menus") +#define NAV_ACTIVATE_KEY_TEXT N_("Activate") +#define NAV_ACTIVATE_KEY_LONGTEXT N_("Select the key to activate selected item in dvd menus") +#define VOL_UP_KEY_TEXT N_("Volume up") +#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 PLAYLIST_USAGE N_("\nPlaylist items:" \ "\n *.mpg, *.vob plain MPEG-1/2 files" \ @@ -430,7 +529,7 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; "\n [vcd:][device][@[title][,[chapter]]" \ "\n VCD device" \ "\n udpstream:[@[][:]]" \ - "\n UDP stream sent by VLS" \ + "\n UDP stream sent by a streaming server" \ "\n vlc:pause pause execution of " \ "playlist items" \ "\n vlc:quit quit VLC" \ @@ -453,25 +552,30 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; vlc_module_begin(); /* Interface options */ - add_category_hint( N_("Interface"), NULL, VLC_FALSE ); + 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, EXTRAINTF_LONGTEXT, VLC_TRUE ); - add_integer_with_short( "verbose", 'v', -1, NULL, + 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_bool( "translation", 1, NULL, TRANSLATION_TEXT, TRANSLATION_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_bool( "color", 0, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE ); - add_bool( "advanced", 0, NULL, ADVANCED_TEXT, ADVANCED_LONGTEXT, VLC_FALSE ); - add_string( "search-path", NULL, NULL, INTF_PATH_TEXT, INTF_PATH_LONGTEXT, VLC_TRUE ); - add_string( "plugin-path", NULL, NULL, + 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_category_hint( N_("Audio"), AOUT_CAT_LONGTEXT , 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 ); + AOUT_TEXT, AOUT_LONGTEXT, VLC_TRUE); + 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 ); @@ -479,24 +583,37 @@ vlc_module_begin(); AOUT_VOLUME_MIN, AOUT_VOLUME_MAX, NULL, VOLUME_SAVE_TEXT, VOLUME_SAVE_LONGTEXT, VLC_TRUE ); add_integer( "aout-rate", -1, NULL, AOUT_RATE_TEXT, AOUT_RATE_LONGTEXT, VLC_TRUE ); +#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_string("audio-filter",0,NULL,AUDIO_FILTER_TEXT, + AUDIO_FILTER_LONGTEXT,VLC_FALSE); + /* Video options */ - add_category_hint( N_("Video"), NULL, VLC_FALSE ); + 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_FALSE ); + VOUT_TEXT, VOUT_LONGTEXT, VLC_TRUE ); 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 ); - add_integer( "spumargin", -1, NULL, SPUMARGIN_TEXT, SPUMARGIN_LONGTEXT, VLC_TRUE ); +#endif + add_integer( "spumargin", -1, NULL, SPUMARGIN_TEXT, + SPUMARGIN_LONGTEXT, VLC_TRUE ); 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 @@ -504,23 +621,11 @@ 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_bool( "network-channel", 0, NULL, - NETCHANNEL_TEXT, NETCHANNEL_LONGTEXT, VLC_TRUE ); - add_string( "channel-server", "localhost", NULL, - CHAN_SERV_TEXT, CHAN_SERV_LONGTEXT, VLC_TRUE ); - add_integer( "channel-port", 6010, NULL, - CHAN_PORT_TEXT, CHAN_PORT_LONGTEXT, VLC_TRUE ); add_integer( "mtu", 1500, NULL, MTU_TEXT, MTU_LONGTEXT, VLC_TRUE ); -#ifdef SYS_DARWIN - add_string( "iface", "en0", NULL, IFACE_TEXT, IFACE_LONGTEXT, VLC_TRUE ); -#else - add_string( "iface", "eth0", NULL, IFACE_TEXT, IFACE_LONGTEXT, VLC_TRUE ); -#endif add_string( "iface-addr", "", NULL, IFACE_ADDR_TEXT, IFACE_ADDR_LONGTEXT, VLC_TRUE ); - add_integer( "ttl", 1, NULL, TTL_TEXT, TTL_LONGTEXT, VLC_TRUE ); add_integer( "program", 0, NULL, INPUT_PROGRAM_TEXT, INPUT_PROGRAM_LONGTEXT, VLC_TRUE ); @@ -530,6 +635,11 @@ vlc_module_begin(); INPUT_CHAN_TEXT, INPUT_CHAN_LONGTEXT, VLC_TRUE ); add_integer( "spu-channel", -1, NULL, 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_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 ); @@ -538,34 +648,34 @@ vlc_module_begin(); add_bool_with_short( "ipv4", '4', 0, NULL, IPV4_TEXT, IPV4_LONGTEXT, VLC_FALSE ); /* 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_category_hint( N_("Encoders"), NULL, VLC_TRUE ); - add_module( "video-encoder", "video encoder", NULL, NULL, ENCODER_VIDEO_TEXT, ENCODER_VIDEO_LONGTEXT, VLC_TRUE ); - add_module( "audio-encoder", "audio encoder", NULL, NULL, ENCODER_AUDIO_TEXT, ENCODER_AUDIO_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-audio", 1, NULL, SOUT_AUDIO_TEXT, SOUT_AUDIO_LONGTEXT, VLC_TRUE ); - add_string_from_list( "sout-acodec", "", ppsz_sout_acodec, NULL, SOUT_ACODEC_TEXT, SOUT_ACODEC_LONGTEXT, VLC_TRUE ); - add_bool( "sout-abitrate", 0, NULL, SOUT_ABITRATE_TEXT, SOUT_ABITRATE_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-video", 1, NULL, SOUT_VIDEO_TEXT, SOUT_VIDEO_LONGTEXT, VLC_TRUE ); - add_string_from_list( "sout-vcodec", "", ppsz_sout_vcodec, NULL, SOUT_VCODEC_TEXT, SOUT_VCODEC_LONGTEXT, VLC_TRUE ); - add_bool( "sout-vbitrate", 0, NULL, SOUT_VBITRATE_TEXT, SOUT_VBITRATE_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 ); @@ -577,23 +687,44 @@ vlc_module_begin(); #endif /* Playlist options */ - add_category_hint( N_("Playlist"), NULL, VLC_FALSE ); + 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( "playlist", 0, NULL, LAUNCH_TEXT, LAUNCH_LONGTEXT, VLC_FALSE ); - add_bool( "enqueue", 0, NULL, ENQUEUE_TEXT, ENQUEUE_LONGTEXT, VLC_FALSE ); - add_bool( "loop", 0, NULL, LOOP_TEXT, LOOP_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 ); /* 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(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"), 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 ); + /* Usage (mainly useful for cmd line stuff) */ add_usage_hint( PLAYLIST_USAGE ); @@ -603,20 +734,23 @@ 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 } }; /*****************************************************************************