X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.h;h=eca061ab13457e4e5faaa9833102d846f999b149;hb=e9694509281cd3378759235433f576f2bfdb72ba;hp=4ac02a38b4c61d7816bd10d02d8bd50f2ce8cc14;hpb=c9bcebfb8f75cf314e33db9fae0a227c9377806d;p=vlc diff --git a/src/libvlc.h b/src/libvlc.h index 4ac02a38b4..eca061ab13 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -36,6 +36,9 @@ static char *ppsz_language_text[] = N_("Norwegian"), N_("Polish"), N_("Brazilian"), N_("Russian"), N_("Swedish") }; +static char *ppsz_snap_formats[] = +{ "png", "jpg" }; + /***************************************************************************** * Configuration options for the main program. Each module will also separatly * define its own configuration options. @@ -61,6 +64,10 @@ static char *ppsz_language_text[] = "interface. Use a comma separated list of interface modules. (common " \ "values are logger, gestures, sap, rc, http or screensaver)") +#define CONTROL_TEXT N_("Control interfaces") +#define CONTROL_LONGTEXT N_( \ + "This option allows you to select control interfaces. " ) + #define VERBOSE_TEXT N_("Verbosity (0,1,2)") #define VERBOSE_LONGTEXT N_( \ "This options sets the verbosity level (0=only errors and " \ @@ -89,7 +96,7 @@ static char *ppsz_language_text[] = #define AOUT_CAT_LONGTEXT N_( \ "These options allow you to modify the behavior of the audio " \ "subsystem, and to add audio filters which can be used for " \ - "post processing or visual effects (spectrum analyzer, ...).\n" \ + "post processing or visual effects (spectrum analyzer, etc.).\n" \ "Enable these filters here, and configure them in the \"audio filters\" " \ "modules section.") @@ -149,7 +156,12 @@ static char *ppsz_language_text[] = #define AUDIO_FILTER_TEXT N_("Audio filters") #define AUDIO_FILTER_LONGTEXT N_( \ "This allows you to add audio post processing filters, to modify " \ - "the sound, or audio visualization modules (spectrum analyzer, ...).") + "the sound" ) + +#define AUDIO_VISUAL_TEXT N_("Audio visualizations ") +#define AUDIO_VISUAL_LONGTEXT N_( \ + "This allows you to add visualization modules " \ + "(spectrum analyzer, etc.).") #define AUDIO_CHANNEL_MIXER N_("Channel mixer") #define AUDIO_CHANNEL_MIXER_LONGTEXT N_( \ @@ -160,7 +172,7 @@ static char *ppsz_language_text[] = #define VOUT_CAT_LONGTEXT N_( \ "These options allow you to modify the behavior of the video output " \ "subsystem. You can for example enable video filters (deinterlacing, " \ - "image adjusting, ...). Enable these filters here and configure " \ + "image adjusting, etc.). Enable these filters here and configure " \ "them in the \"video filters\" modules section. You can also set many " \ "miscellaneous video options." ) @@ -232,12 +244,27 @@ static char *ppsz_align_descriptions[] = #define VIDEO_ON_TOP_LONGTEXT N_("Always place the video window on top of " \ "other windows." ) +#define VIDEO_DECO_TEXT N_("Window decorations") +#define VIDEO_DECO_LONGTEXT N_( \ + "If this option is disabled, VLC will avoid creating window caption, " \ + "frames, etc... around the video. Currently only supported on Windows.") + #define FILTER_TEXT N_("Video filter module") #define FILTER_LONGTEXT N_( \ "This will allow you to add a post-processing filter to enhance the " \ "picture quality, for instance deinterlacing, or to clone or distort " \ "the video window.") +#define SNAP_PATH_TEXT N_("Video snapshot directory") +#define SNAP_PATH_LONGTEXT N_( \ + "Allows you to specify the directory where the video snapshots will " \ + "be stored.") + +#define SNAP_FORMAT_TEXT N_("Video snapshot format") +#define SNAP_FORMAT_LONGTEXT N_( \ + "Allows you to specify the image format in which the video snapshots will " \ + "be stored.") + #define ASPECT_RATIO_TEXT N_("Source aspect ratio") #define ASPECT_RATIO_LONGTEXT N_( \ "This will force the source aspect ratio. For instance, some DVDs claim " \ @@ -247,6 +274,10 @@ static char *ppsz_align_descriptions[] = "aspect, or a float value (1.25, 1.3333, etc.) expressing pixel " \ "squareness.") +#define SKIP_FRAMES_TEXT N_("Skip frames") +#define SKIP_FRAMES_LONGTEXT N_( \ + "Disable this option to disable frame drops on MPEG-2 streams.") + #define INPUT_CAT_LONGTEXT N_( \ "These options allow you to modify the behavior of the input " \ "subsystem, such as the DVD or VCD device, the network interface " \ @@ -283,14 +314,9 @@ static char *ppsz_align_descriptions[] = #define INPUT_PROGRAMS_TEXT N_("Choose programs") #define INPUT_PROGRAMS_LONGTEXT N_( \ - "Choose the programs to select by giving a comma-separated list of" \ + "Choose the programs to select by giving a comma-separated list of " \ "SIDs.") -#define INPUT_AUDIO_TEXT N_("Choose audio") -#define INPUT_AUDIO_LONGTEXT N_( \ - "Give the default type of audio you want to use in a DVD. " \ - "(Developers only)") - #define INPUT_CHAN_TEXT N_("Choose audio channel") #define INPUT_CHAN_LONGTEXT N_( \ "Give the stream number of the audio channel you want to use in a DVD " \ @@ -301,7 +327,7 @@ static char *ppsz_align_descriptions[] = "Give the stream number of the subtitle channel you want to use " \ "(from 0 to n).") -#define INPUT_REPEAT_TEXT N_("Number of time the same input will be repeated") +#define INPUT_REPEAT_TEXT N_("Input repetitions") #define INPUT_REPEAT_LONGTEXT N_("Number of time the same input will be repeated") #define START_TIME_TEXT N_("Input start time (seconds)") @@ -316,11 +342,11 @@ static char *ppsz_align_descriptions[] = #define BOOKMARKS_TEXT N_("Bookmarks list for a stream") #define BOOKMARKS_LONGTEXT N_("You can specify a list of bookmarks for a stream in " \ "the form \"{name=bookmark-name,time=optional-time-offset," \ - "bytes=optional-byte-offset},{etc...}\"") + "bytes=optional-byte-offset},{...}\"") #define SUB_CAT_LONGTEXT N_( \ "These options allow you to modify the behavior of the subpictures " \ - "subsystem. You can for example enable subpictures filters (logo, ...). " \ + "subsystem. You can for example enable subpictures filters (logo, etc.). " \ "Enable these filters here and configure them in the " \ "\"subpictures filters\" modules section. You can also set many " \ "miscellaneous subpictures options." ) @@ -405,6 +431,22 @@ static char *ppsz_align_descriptions[] = "If you check this box, IPv4 will be used by default for all UDP and " \ "HTTP connections.") +#define SOCKS_SERVER_TEXT N_("SOCKS server") +#define SOCKS_SERVER_LONGTEXT N_( \ + "Allow you to specify a SOCKS server to use. It must be of the form " \ + "address:port . It will be used for all TCP connections" ) + +#define SOCKS_USER_TEXT N_("SOCKS user name") +#define SOCKS_USER_LONGTEXT N_("Allows you to modify the user name that will " \ + "be used for the connection to the SOCKS server.") + +#define SOCKS_PASS_TEXT N_("SOCKS password") +#define SOCKS_PASS_LONGTEXT N_("Allows you to modify the password that will " \ + "be used for the connection to the SOCKS server.") + + + + #define META_TITLE_TEXT N_("Title metadata") #define META_TITLE_LONGTEXT N_( \ "Allows you to specify a \"title\" metadata for an input.") @@ -545,6 +587,11 @@ static char *ppsz_align_descriptions[] = "These options define the behavior of the playlist. Some " \ "of them can be overridden in the playlist dialog box." ) +#define SD_TEXT N_( "Services discovery modules") +#define SD_LONGTEXT N_( \ + "Specifies the services discovery modules to load, separated by commas." \ + "Typical values are sap, hal, ..." ) + #define RANDOM_TEXT N_("Play files randomly forever") #define RANDOM_LONGTEXT N_( \ "When selected, VLC will randomly play files in the playlist until " \ @@ -605,6 +652,11 @@ static char *ppsz_align_descriptions[] = "This option allows you to specify an additional path for VLC to look " \ "for its modules.") +#define VLM_CONF_TEXT N_("VLM configuration file") +#define VLM_CONF_LONGTEXT N_( \ + "This option allows you to specify a VLM configuration file that will " \ + "be read when VLM is launched.") + #define PLUGINS_CACHE_TEXT N_("Use a plugins cache") #define PLUGINS_CACHE_LONGTEXT N_( \ "This option allows you to use a plugins cache which will greatly " \ @@ -711,6 +763,10 @@ static char *ppsz_align_descriptions[] = #define SUBDELAY_UP_KEY_LONGTEXT N_("Select the key to increase the subtitle delay.") #define SUBDELAY_DOWN_KEY_TEXT N_("Subtitle delay down") #define SUBDELAY_DOWN_KEY_LONGTEXT N_("Select the key to decrease the subtitle delay.") +#define AUDIODELAY_UP_KEY_TEXT N_("Audio delay up") +#define AUDIODELAY_UP_KEY_LONGTEXT N_("Select the key to increase the audio delay.") +#define AUDIODELAY_DOWN_KEY_TEXT N_("Audio delay down") +#define AUDIODELAY_DOWN_KEY_LONGTEXT N_("Select the key to decrease the audio delay.") #define PLAY_BOOKMARK1_KEY_TEXT N_("Play playlist bookmark 1") #define PLAY_BOOKMARK2_KEY_TEXT N_("Play playlist bookmark 2") #define PLAY_BOOKMARK3_KEY_TEXT N_("Play playlist bookmark 3") @@ -745,6 +801,8 @@ static char *ppsz_align_descriptions[] = #define SUBTITLE_TRACK_KEY_LONGTEXT N_("Cycle through the available subtitle tracks") #define INTF_SHOW_KEY_TEXT N_("Show interface") #define INTF_SHOW_KEY_LONGTEXT N_("Raise the interface above all other windows") +#define SNAP_KEY_TEXT N_("Take video snapshot") +#define SNAP_KEY_LONGTEXT N_("Takes a video snapshot and writes it to disk.") #define PLAYLIST_USAGE N_( \ "\nPlaylist MRL syntax:" \ @@ -778,35 +836,14 @@ static char *ppsz_align_descriptions[] = * N_(text), N_(longtext) ); * add_integer( option_name, i_value, p_callback, N_(text), N_(longtext), b_advanced_option ); - * add_bool( option_name, b_value, p_callback, N_(text), N_(longtext), + * add_bool( option_name, b_value, p_callback, N_(text), N_(longtext), b_advanced_option ); */ vlc_module_begin(); - /* Interface options */ - add_category_hint( N_("Interface"), INTF_CAT_LONGTEXT , VLC_FALSE ); - add_module( "intf", "interface", NULL, NULL, INTF_TEXT, - INTF_LONGTEXT, VLC_TRUE ); - change_short('I'); - add_string( "extraintf", NULL, NULL, EXTRAINTF_TEXT, - EXTRAINTF_LONGTEXT, VLC_FALSE ); - add_integer( "verbose", 0, NULL, VERBOSE_TEXT, VERBOSE_LONGTEXT, - VLC_FALSE ); - change_short('v'); - add_bool( "quiet", 0, NULL, QUIET_TEXT, QUIET_LONGTEXT, VLC_TRUE ); - change_short('q'); - add_string( "language", "auto", NULL, LANGUAGE_TEXT, LANGUAGE_LONGTEXT, - VLC_FALSE ); - change_string_list( ppsz_language, ppsz_language_text, 0 ); - add_bool( "color", 0, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE ); - add_bool( "advanced", 0, NULL, ADVANCED_TEXT, - ADVANCED_LONGTEXT, VLC_FALSE ); - /* Audio options */ - 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'); + set_category( CAT_AUDIO ); + set_subcategory( SUBCAT_AUDIO_GENERAL ); 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, @@ -823,21 +860,31 @@ vlc_module_begin(); add_bool( "spdif", 0, NULL, SPDIF_TEXT, SPDIF_LONGTEXT, VLC_FALSE ); add_integer( "audio-desync", 0, NULL, DESYNC_TEXT, DESYNC_LONGTEXT, VLC_TRUE ); - add_string( "audio-filter", 0, NULL,AUDIO_FILTER_TEXT, - AUDIO_FILTER_LONGTEXT, VLC_FALSE ); + set_subcategory( SUBCAT_AUDIO_AOUT ); + add_module( "aout", "audio output", NULL, NULL, AOUT_TEXT, AOUT_LONGTEXT, + VLC_TRUE ); + set_subcategory( SUBCAT_AUDIO_AFILTER ); + add_module_list_cat( "audio-filter", SUBCAT_AUDIO_AFILTER, 0, + NULL, AUDIO_FILTER_TEXT, + AUDIO_FILTER_LONGTEXT, VLC_FALSE ); + set_subcategory( SUBCAT_AUDIO_VISUAL ); + add_string( "audio-visual", 0, NULL,AUDIO_VISUAL_TEXT, + AUDIO_VISUAL_LONGTEXT, VLC_FALSE ); + set_subcategory( SUBCAT_AUDIO_MISC ); add_module( "audio-channel-mixer", "audio filter", NULL, NULL, AUDIO_CHANNEL_MIXER, AUDIO_CHANNEL_MIXER_LONGTEXT, VLC_FALSE ); + change_short('A'); /* Video options */ - 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'); + set_category( CAT_VIDEO ); + set_subcategory( SUBCAT_VIDEO_GENERAL ); add_bool( "video", 1, NULL, VIDEO_TEXT, VIDEO_LONGTEXT, VLC_TRUE ); add_integer( "width", -1, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, VLC_TRUE ); add_integer( "height", -1, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, VLC_TRUE ); add_integer( "video-x", -1, NULL, VIDEOX_TEXT, VIDEOX_LONGTEXT, VLC_TRUE ); add_integer( "video-y", -1, NULL, VIDEOY_TEXT, VIDEOY_LONGTEXT, VLC_TRUE ); + add_bool( "video-deco", 1, NULL, VIDEO_DECO_TEXT, + VIDEO_DECO_LONGTEXT, VLC_TRUE ); add_string( "video-title", NULL, NULL, VIDEO_TITLE_TEXT, VIDEO_TITLE_LONGTEXT, VLC_TRUE ); add_integer( "align", 0, NULL, ALIGN_TEXT, ALIGN_LONGTEXT, VLC_TRUE ); @@ -848,23 +895,40 @@ vlc_module_begin(); add_bool( "fullscreen", 0, NULL, FULLSCREEN_TEXT, FULLSCREEN_LONGTEXT, VLC_FALSE ); change_short('f'); + add_bool( "skip-frames", 1, NULL, SKIP_FRAMES_TEXT, + SKIP_FRAMES_LONGTEXT, VLC_FALSE ); #ifndef SYS_DARWIN add_bool( "overlay", 1, NULL, OVERLAY_TEXT, OVERLAY_LONGTEXT, VLC_TRUE ); #endif - add_bool( "video-on-top", 0, NULL, VIDEO_ON_TOP_TEXT, VIDEO_ON_TOP_LONGTEXT, VLC_FALSE ); - add_module( "filter", "video filter", NULL, NULL, - FILTER_TEXT, FILTER_LONGTEXT, VLC_FALSE ); add_string( "aspect-ratio", "", NULL, ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, VLC_TRUE ); + add_directory( "snapshot-path", NULL, NULL, SNAP_PATH_TEXT, + SNAP_PATH_LONGTEXT, VLC_FALSE ); + add_string( "snapshot-format", "png", NULL, SNAP_FORMAT_TEXT, + SNAP_FORMAT_LONGTEXT, VLC_FALSE ); + change_string_list( ppsz_snap_formats, NULL, 0 ); + + set_subcategory( SUBCAT_VIDEO_VOUT ); + add_module( "vout", "video output", NULL, NULL, VOUT_TEXT, VOUT_LONGTEXT, + VLC_TRUE ); + change_short('V'); + + set_subcategory( SUBCAT_VIDEO_VFILTER ); + add_module_list_cat( "filter", SUBCAT_VIDEO_VFILTER, NULL, NULL, + FILTER_TEXT, FILTER_LONGTEXT, VLC_FALSE ); + #if 0 add_string( "pixel-ratio", "1", NULL, PIXEL_RATIO_TEXT, PIXEL_RATIO_TEXT ); #endif /* Subpictures options */ - add_category_hint( N_("Subpictures"), SUB_CAT_LONGTEXT , VLC_FALSE ); + set_subcategory( SUBCAT_VIDEO_SUBPIC ); + set_section( N_("On Screen Display") , NULL ); add_bool( "osd", 1, NULL, OSD_TEXT, OSD_LONGTEXT, VLC_FALSE ); + + set_section( N_("Subtitles") , NULL ); add_bool( "sub-autodetect-file", VLC_TRUE, NULL, SUB_AUTO_TEXT, SUB_AUTO_LONGTEXT, VLC_FALSE ); add_integer( "sub-autodetect-fuzzy", 3, NULL, @@ -880,11 +944,21 @@ vlc_module_begin(); SUB_FILE_LONGTEXT, VLC_TRUE ); add_integer( "spumargin", -1, NULL, SPUMARGIN_TEXT, SPUMARGIN_LONGTEXT, VLC_TRUE ); + + set_section( N_( "Overlays" ) , NULL ); add_module( "sub-filter", "sub filter", NULL, NULL, SUB_FILTER_TEXT, SUB_FILTER_LONGTEXT, VLC_TRUE ); + set_subcategory( SUBCAT_VIDEO_TEXT ); + /* Input options */ - add_category_hint( N_("Input"), INPUT_CAT_LONGTEXT , VLC_FALSE ); + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_ACCESS ); + set_subcategory( SUBCAT_INPUT_DEMUX ); + set_subcategory( SUBCAT_INPUT_VCODEC ); + set_subcategory( SUBCAT_INPUT_ACODEC ); + set_subcategory( SUBCAT_INPUT_SCODEC ); + set_subcategory( SUBCAT_INPUT_ADVANCED ); add_integer( "cr-average", 40, NULL, CR_AVERAGE_TEXT, CR_AVERAGE_LONGTEXT, VLC_FALSE ); add_integer( "server-port", 1234, NULL, @@ -897,8 +971,6 @@ vlc_module_begin(); INPUT_PROGRAM_TEXT, INPUT_PROGRAM_LONGTEXT, VLC_TRUE ); add_string( "programs", "", NULL, INPUT_PROGRAMS_TEXT, INPUT_PROGRAMS_LONGTEXT, VLC_FALSE ); - add_integer( "audio-type", -1, NULL, - INPUT_AUDIO_TEXT, INPUT_AUDIO_LONGTEXT, VLC_TRUE ); add_integer( "audio-channel", -1, NULL, INPUT_CHAN_TEXT, INPUT_CHAN_LONGTEXT, VLC_FALSE ); add_integer( "spu-channel", -1, NULL, @@ -915,6 +987,8 @@ vlc_module_begin(); add_string( "bookmarks", NULL, NULL, BOOKMARKS_TEXT, BOOKMARKS_LONGTEXT, VLC_TRUE ); + set_section( N_( "Default devices") , NULL ) + add_file( "dvd", DVD_DEVICE, NULL, DVD_DEV_TEXT, DVD_DEV_LONGTEXT, VLC_FALSE ); add_file( "vcd", VCD_DEVICE, NULL, VCD_DEV_TEXT, VCD_DEV_LONGTEXT, @@ -927,6 +1001,16 @@ vlc_module_begin(); add_bool( "ipv4", 0, NULL, IPV4_TEXT, IPV4_LONGTEXT, VLC_FALSE ); change_short('4'); + set_section( N_( "Socks proxy") , NULL ) + add_string( "socks", NULL, NULL, + SOCKS_SERVER_TEXT, SOCKS_SERVER_LONGTEXT, VLC_TRUE ); + add_string( "socks-user", NULL, NULL, + SOCKS_USER_TEXT, SOCKS_USER_LONGTEXT, VLC_TRUE ); + add_string( "socks-pwd", NULL, NULL, + SOCKS_PASS_TEXT, SOCKS_PASS_LONGTEXT, VLC_TRUE ); + + + set_section( N_("Metadata" ) , NULL ) add_string( "meta-title", NULL, NULL, META_TITLE_TEXT, META_TITLE_LONGTEXT, VLC_TRUE ); add_string( "meta-author", NULL, NULL, META_AUTHOR_TEXT, @@ -953,7 +1037,10 @@ vlc_module_begin(); /* Stream output options */ + set_category( CAT_SOUT ); + set_subcategory( SUBCAT_SOUT_GENERAL ); add_category_hint( N_("Stream output"), SOUT_CAT_LONGTEXT , VLC_TRUE ); + add_string( "sout", NULL, NULL, SOUT_TEXT, SOUT_LONGTEXT, VLC_TRUE ); add_bool( "sout-display", VLC_FALSE, NULL, SOUT_DISPLAY_TEXT, SOUT_DISPLAY_LONGTEXT, VLC_TRUE ); @@ -965,22 +1052,29 @@ vlc_module_begin(); SOUT_AUDIO_LONGTEXT, VLC_TRUE ); add_bool( "sout-video", 1, NULL, SOUT_VIDEO_TEXT, SOUT_VIDEO_LONGTEXT, VLC_TRUE ); + add_integer( "ttl", 1, NULL, TTL_TEXT, TTL_LONGTEXT, VLC_TRUE ); - add_module( "packetizer", "packetizer", NULL, NULL, - PACKETIZER_TEXT, PACKETIZER_LONGTEXT, VLC_TRUE ); + set_subcategory( SUBCAT_SOUT_STREAM ); + set_subcategory( SUBCAT_SOUT_MUX ); add_module( "mux", "sout mux", NULL, NULL, MUX_TEXT, MUX_LONGTEXT, VLC_TRUE ); + set_subcategory( SUBCAT_SOUT_ACO ); add_module( "access_output", "sout access", NULL, NULL, ACCESS_OUTPUT_TEXT, ACCESS_OUTPUT_LONGTEXT, VLC_TRUE ); - add_integer( "ttl", 1, NULL, TTL_TEXT, TTL_LONGTEXT, VLC_TRUE ); + set_subcategory( SUBCAT_SOUT_PACKETIZER ); + add_module( "packetizer", "packetizer", NULL, NULL, + PACKETIZER_TEXT, PACKETIZER_LONGTEXT, VLC_TRUE ); + set_subcategory( SUBCAT_SOUT_SAP ); add_bool( "sap-flow-control", VLC_FALSE, NULL, ANN_SAPCTRL_TEXT, ANN_SAPCTRL_LONGTEXT, VLC_TRUE ); add_integer( "sap-interval", 5, NULL, ANN_SAPINTV_TEXT, ANN_SAPINTV_LONGTEXT, VLC_TRUE ); + set_subcategory( SUBCAT_SOUT_VOD ); /* CPU options */ - add_category_hint( N_("CPU"), CPU_CAT_LONGTEXT, VLC_TRUE ); + set_category( CAT_ADVANCED ); + set_subcategory( SUBCAT_ADVANCED_CPU ); #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 ); @@ -991,19 +1085,8 @@ vlc_module_begin(); #if defined( __powerpc__ ) || defined( SYS_DARWIN ) add_bool( "altivec", 1, NULL, ALTIVEC_TEXT, ALTIVEC_LONGTEXT, VLC_TRUE ); #endif - - /* Playlist options */ - add_category_hint( N_("Playlist"), PLAYLIST_CAT_LONGTEXT , VLC_FALSE ); - add_bool( "random", 0, NULL, RANDOM_TEXT, RANDOM_LONGTEXT, VLC_FALSE ); - change_short('Z'); - add_bool( "loop", 0, NULL, LOOP_TEXT, LOOP_LONGTEXT, VLC_FALSE ); - change_short('L'); - add_bool( "repeat", 0, NULL, REPEAT_TEXT, REPEAT_LONGTEXT, VLC_TRUE ); - change_short('R'); - add_bool( "play-and-stop", 0, NULL, PAS_TEXT, PAS_LONGTEXT, VLC_TRUE ); - /* Misc options */ - add_category_hint( N_("Miscellaneous"), MISC_CAT_LONGTEXT, VLC_TRUE ); + set_subcategory( SUBCAT_ADVANCED_MISC ); add_module( "memcpy", "memcpy", NULL, NULL, MEMCPY_TEXT, MEMCPY_LONGTEXT, VLC_TRUE ); add_module( "access", "access", NULL, NULL, ACCESS_TEXT, @@ -1016,6 +1099,8 @@ vlc_module_begin(); PLUGINS_CACHE_LONGTEXT, VLC_TRUE ); add_directory( "plugin-path", NULL, NULL, PLUGIN_PATH_TEXT, PLUGIN_PATH_LONGTEXT, VLC_TRUE ); + add_string( "vlm-conf", NULL, NULL, VLM_CONF_TEXT, + VLM_CONF_LONGTEXT, VLC_TRUE ); #if !defined(WIN32) add_bool( "daemon", 0, NULL, DAEMON_TEXT, DAEMON_LONGTEXT, VLC_TRUE ); @@ -1043,10 +1128,87 @@ vlc_module_begin(); WIN9X_CV_LONGTEXT, VLC_TRUE ); #endif + /* Playlist options */ + set_category( CAT_PLAYLIST ); + set_subcategory( SUBCAT_PLAYLIST_GENERAL ); + add_category_hint( N_("Playlist"), PLAYLIST_CAT_LONGTEXT , VLC_FALSE ); + add_bool( "random", 0, NULL, RANDOM_TEXT, RANDOM_LONGTEXT, VLC_FALSE ); + change_short('Z'); + add_bool( "loop", 0, NULL, LOOP_TEXT, LOOP_LONGTEXT, VLC_FALSE ); + change_short('L'); + add_bool( "repeat", 0, NULL, REPEAT_TEXT, REPEAT_LONGTEXT, VLC_TRUE ); + change_short('R'); + add_bool( "play-and-stop", 0, NULL, PAS_TEXT, PAS_LONGTEXT, VLC_TRUE ); + + set_subcategory( SUBCAT_PLAYLIST_SD ); + add_module_list_cat( "services-discovery", SUBCAT_PLAYLIST_SD, NULL, + NULL, SD_TEXT, SD_LONGTEXT, VLC_FALSE ); + change_short('S'); + + /* Interface options */ + set_category( CAT_INTERFACE ); + set_subcategory( SUBCAT_INTERFACE_GENERAL ); + + set_section ( N_("Interface module" ), NULL ); + add_module_cat( "intf", SUBCAT_INTERFACE_GENERAL, NULL, NULL, INTF_TEXT, + INTF_LONGTEXT, VLC_FALSE ); + change_short('I'); + + set_section ( N_("Extra interface modules" ), NULL ); + add_module_list_cat( "extraintf", SUBCAT_INTERFACE_GENERAL, + NULL, NULL, EXTRAINTF_TEXT, + EXTRAINTF_LONGTEXT, VLC_FALSE ); + + set_section ( N_("Miscellaneous"), NULL ); + add_integer( "verbose", 0, NULL, VERBOSE_TEXT, VERBOSE_LONGTEXT, + VLC_FALSE ); + change_short('v'); + add_bool( "quiet", 0, NULL, QUIET_TEXT, QUIET_LONGTEXT, VLC_TRUE ); + change_short('q'); + add_string( "language", "auto", NULL, LANGUAGE_TEXT, LANGUAGE_LONGTEXT, + VLC_FALSE ); + change_string_list( ppsz_language, ppsz_language_text, 0 ); + add_bool( "color", 0, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE ); + add_bool( "advanced", 0, NULL, ADVANCED_TEXT, ADVANCED_LONGTEXT, + VLC_FALSE ); + + set_subcategory( SUBCAT_INTERFACE_CONTROL ); + add_module_list_cat( "control", SUBCAT_INTERFACE_CONTROL, NULL, NULL, + CONTROL_TEXT, CONTROL_LONGTEXT, VLC_FALSE ); + /* Hotkey options*/ + set_subcategory( SUBCAT_INTERFACE_HOTKEYS ); add_category_hint( N_("Hot keys"), HOTKEY_CAT_LONGTEXT , VLC_FALSE ); #if defined(SYS_DARWIN) +/* Don't use the following combo's */ + +/* copy KEY_MODIFIER_COMMAND|'c' + * cut KEY_MODIFIER_COMMAND|'x' + * paste KEY_MODIFIER_COMMAND|'v' + * select all KEY_MODIFIER_COMMAND|'a' + * preferences KEY_MODIFIER_COMMAND|',' + * hide vlc KEY_MODIFIER_COMMAND|'h' + * hide other KEY_MODIFIER_COMMAND|KEY_MODIFIER_ALT|'h' + * open file KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'o' + * open KEY_MODIFIER_COMMAND|'o' + * open disk KEY_MODIFIER_COMMAND|'d' + * open network KEY_MODIFIER_COMMAND|'n' + * save playlist KEY_MODIFIER_COMMAND|'s' + * playlist random KEY_MODIFIER_COMMAND|'z' + * playlist repeat all KEY_MODIFIER_COMMAND|'l' + * playlist repeat KEY_MODIFIER_COMMAND|'r' + * video half size KEY_MODIFIER_COMMAND|'0' + * video normal size KEY_MODIFIER_COMMAND|'1' + * video double size KEY_MODIFIER_COMMAND|'2' + * video fit to screen KEY_MODIFIER_COMMAND|'3' + * minimize window KEY_MODIFIER_COMMAND|'m' + * close window KEY_MODIFIER_COMMAND|'w' + * show controller KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'c' + * show playlist KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'p' + * show info KEY_MODIFIER_COMMAND|'i' + * help KEY_MODIFIER_COMMAND|'?' + */ # define KEY_FULLSCREEN KEY_MODIFIER_COMMAND|'f' # define KEY_PLAY_PAUSE KEY_MODIFIER_COMMAND|'p' # define KEY_PAUSE KEY_UNSET @@ -1072,11 +1234,14 @@ vlc_module_begin(); # define KEY_VOL_UP KEY_MODIFIER_COMMAND|KEY_UP # define KEY_VOL_DOWN KEY_MODIFIER_COMMAND|KEY_DOWN # define KEY_VOL_MUTE KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'m' -# define KEY_SUBDELAY_UP KEY_MODIFIER_COMMAND|'k' -# define KEY_SUBDELAY_DOWN KEY_MODIFIER_COMMAND|'j' +# define KEY_SUBDELAY_UP 'j' +# define KEY_SUBDELAY_DOWN 'h' +# define KEY_AUDIODELAY_UP 'g' +# define KEY_AUDIODELAY_DOWN 'f' # define KEY_AUDIO_TRACK 'l' # define KEY_SUBTITLE_TRACK 's' # define KEY_INTF_SHOW 'i' +# define KEY_SNAPSHOT KEY_MODIFIER_COMMAND|KEY_MODIFIER_ALT|'s' # define KEY_SET_BOOKMARK1 KEY_MODIFIER_COMMAND|KEY_F1 # define KEY_SET_BOOKMARK2 KEY_MODIFIER_COMMAND|KEY_F2 @@ -1129,9 +1294,13 @@ vlc_module_begin(); # define KEY_VOL_MUTE 'm' # define KEY_SUBDELAY_UP KEY_MODIFIER_CTRL|'h' # define KEY_SUBDELAY_DOWN KEY_MODIFIER_CTRL|'j' +# define KEY_AUDIODELAY_UP KEY_MODIFIER_CTRL|'k' +# define KEY_AUDIODELAY_DOWN KEY_MODIFIER_CTRL|'l' + # define KEY_AUDIO_TRACK 'l' # define KEY_SUBTITLE_TRACK 'k' # define KEY_INTF_SHOW 'i' +# define KEY_SNAPSHOT KEY_MODIFIER_CTRL|'s' # define KEY_SET_BOOKMARK1 KEY_MODIFIER_CTRL|KEY_F1 # define KEY_SET_BOOKMARK2 KEY_MODIFIER_CTRL|KEY_F2 @@ -1213,12 +1382,18 @@ vlc_module_begin(); SUBDELAY_UP_KEY_TEXT, SUBDELAY_UP_KEY_LONGTEXT, VLC_TRUE ); add_key( "key-subdelay-down", KEY_SUBDELAY_DOWN, NULL, SUBDELAY_DOWN_KEY_TEXT, SUBDELAY_DOWN_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-audiodelay-up", KEY_AUDIODELAY_UP, NULL, + AUDIODELAY_UP_KEY_TEXT, AUDIODELAY_UP_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-audiodelay-down", KEY_AUDIODELAY_DOWN, NULL, + AUDIODELAY_DOWN_KEY_TEXT, AUDIODELAY_DOWN_KEY_LONGTEXT, VLC_TRUE ); add_key( "key-audio-track", KEY_AUDIO_TRACK, NULL, AUDIO_TRACK_KEY_TEXT, AUDIO_TRACK_KEY_LONGTEXT, VLC_FALSE ); add_key( "key-subtitle-track", KEY_SUBTITLE_TRACK, NULL, SUBTITLE_TRACK_KEY_TEXT, SUBTITLE_TRACK_KEY_LONGTEXT, VLC_FALSE ); add_key( "key-intf-show", KEY_INTF_SHOW, NULL, INTF_SHOW_KEY_TEXT, INTF_SHOW_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-snapshot", KEY_SNAPSHOT, NULL, + SNAP_KEY_TEXT, SNAP_KEY_LONGTEXT, VLC_TRUE ); add_key( "key-set-bookmark1", KEY_SET_BOOKMARK1, NULL, SET_BOOKMARK1_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); @@ -1326,9 +1501,12 @@ static struct hotkey p_hotkeys[] = { "key-vol-mute", ACTIONID_VOL_MUTE, 0 }, { "key-subdelay-down", ACTIONID_SUBDELAY_DOWN, 0 }, { "key-subdelay-up", ACTIONID_SUBDELAY_UP, 0 }, + { "key-audiodelay-down", ACTIONID_AUDIODELAY_DOWN, 0 }, + { "key-audiodelay-up", ACTIONID_AUDIODELAY_UP, 0 }, { "key-audio-track", ACTIONID_AUDIO_TRACK, 0}, { "key-subtitle-track", ACTIONID_SUBTITLE_TRACK, 0}, { "key-intf-show", ACTIONID_INTF_SHOW, 0}, + { "key-snapshot", ACTIONID_SNAPSHOT, 0}, { "key-nav-activate", ACTIONID_NAV_ACTIVATE, 0 }, { "key-nav-up", ACTIONID_NAV_UP, 0 }, { "key-nav-down", ACTIONID_NAV_DOWN, 0 },