X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_config_cat.h;h=e21c29e8fc40ce6b6e4d49d0b9e6ff8afa057e00;hb=5dbc70c99be39d53beb4d4548fd5767eddd17cf1;hp=9c828dabb07eb473f738d92817d31057866e485d;hpb=d0f2c33c0c6bc59f226a52f18a5a415c24dc4938;p=vlc diff --git a/include/vlc_config_cat.h b/include/vlc_config_cat.h index 9c828dabb0..e21c29e8fc 100644 --- a/include/vlc_config_cat.h +++ b/include/vlc_config_cat.h @@ -1,5 +1,5 @@ /***************************************************************************** - * vlc_help.h: Help strings + * vlc_config_cat.h : Definition of configuration categories ***************************************************************************** * Copyright (C) 2003 the VideoLAN team * $Id$ @@ -31,7 +31,7 @@ */ #define MAIN_TITLE N_( "VLC preferences" ) #define MAIN_HELP N_( \ - "Click on \"Advanced Options\" to see all options." ) + "Select \"Advanced Options\" to see all options." ) #define GENERAL_TITLE N_("General") @@ -39,10 +39,13 @@ #define INTF_TITLE N_("Interface") #define INTF_HELP N_( "Settings for VLC's interfaces" ) -#define INTF_GENERAL_HELP N_( "General interface setttings" ) +#define INTF_GENERAL_HELP N_( "General interface settings" ) + +#define INTF_MAIN_TITLE N_( "Main interfaces" ) +#define INTF_MAIN_HELP N_( "Settings for the main interface" ) #define INTF_CONTROL_TITLE N_( "Control interfaces" ) -#define INTF_CONTROL_HELP N_( "Settings for VLC's Control interfaces" ) +#define INTF_CONTROL_HELP N_( "Settings for VLC's control interfaces" ) #define INTF_HOTKEYS_TITLE N_( "Hotkeys settings" ) #define INTF_HOTKEYS_HELP N_( "Hotkeys settings" ) @@ -66,7 +69,7 @@ #define AOUT_HELP N_("These are general settings for audio output modules.") #define AMISC_TITLE N_("Miscellaneous") -#define AMISC_HELP N_( "Miscellaneous audio settings and modules" ) +#define AMISC_HELP N_( "Miscellaneous audio settings and modules." ) /* Video */ #define VIDEO_TITLE N_("Video") @@ -84,16 +87,18 @@ "Video filters are used to postprocess the video stream." ) #define SUBPIC_TITLE N_( "Subtitles/OSD") -#define SUBPIC_HELP N_( "Miscellaneous settings related to On-Screen-Display, subtitles and overlay subpictures") - +#define SUBPIC_HELP N_( "Miscellaneous settings related to On-Screen-Display,"\ + " subtitles and \"overlay subpictures\".") +/* #define TEXT_TITLE N_("Text rendering") #define TEXT_HELP N_( \ "Use the settings of the \"freetype\" module to choose the font you " \ "want VLC to use for text rendering (to display subtitles for example).") - +*/ /* Input */ #define INPUT_TITLE N_( "Input / Codecs" ) -#define INPUT_HELP N_( "These are the settings for the input, demultiplexing and decoding parts of VLC. Encoder settings can also be found here." ) +#define INPUT_HELP N_( "These are the settings for the input, demultiplexing " \ + "and decoding parts of VLC. Encoder settings can also be found here." ) #define ACCESS_TITLE N_( "Access modules" ) #define ACCESS_HELP N_( \ @@ -111,13 +116,13 @@ #define DEMUX_HELP N_( "Demuxers are used to separate audio and video streams." ) #define VDEC_TITLE N_( "Video codecs" ) -#define VDEC_HELP N_( "Settings for the video-only decoders and encoders" ) +#define VDEC_HELP N_( "Settings for the video-only decoders and encoders." ) #define ADEC_TITLE N_( "Audio codecs" ) -#define ADEC_HELP N_( "Settings for the audio-only decoders and encoders" ) +#define ADEC_HELP N_( "Settings for the audio-only decoders and encoders." ) #define SDEC_TITLE N_( "Other codecs") -#define SDEC_HELP N_( "Settings for audio+video and miscellaneous decoders and encoders" ) +#define SDEC_HELP N_( "Settings for audio+video and miscellaneous decoders and encoders." ) #define ADVANCED_TITLE N_("General") #define ADVANCED_HELP N_( "General input settings. Use with care." ) @@ -136,23 +141,27 @@ #define SOUT_GENERAL_HELP N_( "General stream output settings") #define SOUT_MUX_TITLE N_( "Muxers" ) -#define SOUT_MUX_HELP N_( "Muxers create the encapsulation formats that are used to " \ - "put all the elementary streams (video, audio, ...) " \ - "together. This setting allows you to always force a specific muxer. " \ - "You should probably not do that.\n" \ - "You can also set default parameters for each muxer." ) +#define SOUT_MUX_HELP N_( \ + "Muxers create the encapsulation formats that are used to " \ + "put all the elementary streams (video, audio, ...) " \ + "together. This setting allows you to always force a specific muxer. " \ + "You should probably not do that.\n" \ + "You can also set default parameters for each muxer." ) + #define SOUT_ACO_TITLE N_( "Access output" ) -#define SOUT_ACO_HELP N_( "Access output modules control the ways the muxed streams are sent. " \ - "This setting allows you to always force a specific access output method. " \ - "You should probably not do that.\n" \ - "You can also set default parameters for each access output.") +#define SOUT_ACO_HELP N_( \ + "Access output modules control the ways the muxed streams are sent. " \ + "This setting allows you to always force a specific access output method. " \ + "You should probably not do that.\n" \ + "You can also set default parameters for each access output.") #define SOUT_PACKET_TITLE N_( "Packetizers" ) -#define SOUT_PACKET_HELP N_( "Packetizers are used to \"preprocess\" the elementary "\ - "streams before muxing. " \ - "This setting allows you to always force a packetizer. " \ - "You should probably not do that.\n" \ - "You can also set default parameters for each packetizer." ) +#define SOUT_PACKET_HELP N_( \ + "Packetizers are used to \"preprocess\" the elementary "\ + "streams before muxing. " \ + "This setting allows you to always force a packetizer. " \ + "You should probably not do that.\n" \ + "You can also set default parameters for each packetizer." ) #define SOUT_STREAM_TITLE N_("Sout stream") #define SOUT_STREAM_HELP N_( "Sout stream modules allow to build a sout " \ @@ -161,8 +170,9 @@ "each sout stream module here.") #define SOUT_SAP_TITLE N_( "SAP" ) -#define SOUT_SAP_HELP N_( "SAP is a way to publically announce streams that are being "\ - "sent using multicast UDP or RTP." ) +#define SOUT_SAP_HELP N_( \ + "SAP is a way to publically announce streams that are being "\ + "sent using multicast UDP or RTP." ) #define SOUT_VOD_TITLE N_( "VOD" ) #define SOUT_VOD_HELP N_( "VLC's implementation of Video On Demand" ) @@ -170,20 +180,24 @@ /* Playlist */ #define PLAYLIST_TITLE N_( "Playlist" ) -#define PLAYLIST_HELP N_( "Settings related to playlist behaviour (e.g. playback mode) and to modules that automatically add items to the playlist ('service discovery modules').") +#define PLAYLIST_HELP N_( "Settings related to playlist behaviour " \ + "(e.g. playback mode) and to modules that automatically add "\ + "items to the playlist (\"service discovery\" modules).") #define PGENERAL_HELP N_( "General playlist behaviour") #define SD_TITLE N_("Services discovery") -#define SD_HELP N_("Services discovery modules are facilities that automatically add items to playlist.") +#define SD_HELP N_("Services discovery modules are facilities "\ + "that automatically add items to playlist.") /* Advanced */ #define AADVANCED_TITLE N_( "Advanced" ) #define AADVANCED_HELP N_( "Advanced settings. Use with care.") #define CPU_TITLE N_( "CPU features" ) -#define CPU_HELP N_( "You can choose to disable some CPU accelerations here. You should probably not touch that." ) +#define CPU_HELP N_( "You can choose to disable some CPU accelerations " \ + "here. You should probably not change these settings." ) -#define MISC_TITLE N_( "Other" ) +#define MISC_TITLE N_( "Advanced settings" ) #define MISC_HELP N_( "Other advanced settings") #define NETWORK_TITLE N_( "Network" ) @@ -196,14 +210,14 @@ #define CHROMA_HELP N_("These settings affect chroma transformation modules.") #define PACKETIZER_TITLE N_("Packetizer modules settings" ) -#define PACKETIZER_HELP "These are general settings for the packetizers used in VLC's sout-processes." +#define PACKETIZER_HELP "These are general settings for the "\ + "packetizers used in VLC's stream output subsystem." #define ENCODER_TITLE N_("Encoders settings") #define ENCODER_HELP N_( \ "These are general settings for video/audio/subtitles encoding modules.") - #define DIALOGS_TITLE N_("Dialog providers settings") #define DIALOGS_HELP N_( \ "Dialog providers can be configured here.") @@ -213,9 +227,6 @@ "In this section you can force the behavior of the subtitle demuxer, " \ "for example by setting the subtitles type or file name.") -#define VIDEO_FILTER2_TITLE N_("Video filters settings") -#define VIDEO_FILTER2_HELP " " - /* * A little help for modules with unknown capabilities */ @@ -223,67 +234,19 @@ #define UNKNOWN_TITLE N_("No help available" ) #define UNKNOWN_HELP N_("There is no help available for these modules.") -/***************************************************************************** - * GetCapabilityHelp: Display the help for one capability. - *****************************************************************************/ -static inline char * GetCapabilityHelp( char *psz_capability, int i_type) +/* This function is deprecated and is kept only for compatibility */ +static inline const char * GetCapabilityHelp( char *psz_capability, int i_type) { -/* - if( psz_capability == NULL) return " "; - - if( !strcasecmp(psz_capability,"access_demux") ) - return i_type == 1 ? ACCESS_TITLE : ACCESS_HELP; - if( !strcasecmp(psz_capability,"access2") ) - return i_type == 1 ? ACCESS_TITLE : ACCESS_HELP; - if( !strcasecmp(psz_capability,"audio filter") ) - return i_type == 1 ? AUDIO_FILTER_TITLE : AUDIO_FILTER_HELP; - if( !strcasecmp(psz_capability,"audio filter2") ) - return i_type == 1 ? AUDIO_FILTER2_TITLE : AUDIO_FILTER2_HELP; - if( !strcasecmp(psz_capability,"audio output") ) - return i_type == 1 ? AOUT_TITLE : AOUT_HELP; - if( !strcasecmp(psz_capability,"chroma") ) - return i_type == 1 ? CHROMA_TITLE : CHROMA_HELP; - if( !strcasecmp(psz_capability,"decoder") ) - return i_type == 1 ? DECODER_TITLE : DECODER_HELP; - if( !strcasecmp(psz_capability,"packetizer") ) - return i_type == 1 ? PACKETIZER_TITLE : PACKETIZER_HELP; - if( !strcasecmp(psz_capability,"encoder") ) - return i_type == 1 ? ENCODER_TITLE : ENCODER_HELP; - if( !strcasecmp(psz_capability,"demux2") ) - return i_type == 1 ? DEMUX_TITLE : DEMUX_HELP; - if( !strcasecmp(psz_capability,"interface") ) - return i_type == 1 ? INTERFACE_TITLE : INTERFACE_HELP; - if( !strcasecmp(psz_capability,"dialogs provider") ) - return i_type == 1 ? DIALOGS_TITLE : DIALOGS_HELP; - if( !strcasecmp(psz_capability,"network") ) - return i_type == 1 ? NETWORK_TITLE : NETWORK_HELP; - if( !strcasecmp(psz_capability,"sout access") ) - return i_type == 1 ? SOUT_ACCESS_TITLE : SOUT_ACCESS_HELP; - if( !strcasecmp(psz_capability,"sout mux") ) - return i_type == 1 ? SOUT_MUX_TITLE : SOUT_MUX_HELP; - if( !strcasecmp(psz_capability,"sout stream") ) - return i_type == 1 ? SOUT_STREAM_TITLE : SOUT_STREAM_HELP; - if( !strcasecmp(psz_capability,"subtitle demux") ) - return i_type == 1 ? SUBTITLE_DEMUX_TITLE : SUBTITLE_DEMUX_HELP; - if( !strcasecmp(psz_capability,"text renderer") ) - return i_type == 1 ? TEXT_TITLE : TEXT_HELP; - if( !strcasecmp(psz_capability,"video output") ) - return i_type == 1 ? _VOUT_TITLE : VOUT_HELP; - if( !strcasecmp(psz_capability,"video filter") ) - return i_type == 1 ? VIDEO_FILTER_TITLE : VIDEO_FILTER_HELP; - if( !strcasecmp(psz_capability,"video filter2") ) - return i_type == 1 ? VIDEO_FILTER2_TITLE : VIDEO_FILTER2_HELP; - - */ + (void)psz_capability; (void)i_type; return " "; } - static struct config_category_t categories_array[] = { /* Interface */ { CAT_INTERFACE, INTF_TITLE, INTF_HELP }, { SUBCAT_INTERFACE_GENERAL, GENERAL_TITLE, INTF_GENERAL_HELP }, + { SUBCAT_INTERFACE_MAIN, INTF_MAIN_TITLE, INTF_MAIN_HELP }, { SUBCAT_INTERFACE_CONTROL, INTF_CONTROL_TITLE, INTF_CONTROL_HELP }, { SUBCAT_INTERFACE_HOTKEYS, INTF_HOTKEYS_TITLE, INTF_HOTKEYS_HELP }, @@ -299,7 +262,6 @@ static struct config_category_t categories_array[] = { SUBCAT_VIDEO_VOUT, _VOUT_TITLE, VOUT_HELP }, { SUBCAT_VIDEO_VFILTER, VFILTER_TITLE, VFILTER_HELP }, { SUBCAT_VIDEO_SUBPIC, SUBPIC_TITLE, SUBPIC_HELP }, -// { SUBCAT_VIDEO_TEXT, TEXT_TITLE, TEXT_HELP }, { CAT_INPUT, INPUT_TITLE, INPUT_HELP }, { SUBCAT_INPUT_GENERAL, ADVANCED_TITLE, ADVANCED_HELP }, @@ -326,34 +288,32 @@ static struct config_category_t categories_array[] = { CAT_ADVANCED, AADVANCED_TITLE, AADVANCED_HELP }, { SUBCAT_ADVANCED_CPU, CPU_TITLE, CPU_HELP }, { SUBCAT_ADVANCED_MISC, MISC_TITLE, MISC_HELP }, - { SUBCAT_ADVANCED_NETWORK, NETWORK_TITLE, NETWORK_HELP }, { -1, NULL, NULL } }; - -inline char *config_CategoryNameGet( int i_value ) +static inline const char *config_CategoryNameGet( int i_value ) { int i = 0 ; while( categories_array[i].psz_name != NULL ) { if( categories_array[i].i_id == i_value ) { - return categories_array[i].psz_name; + return _(categories_array[i].psz_name); } i++; } return NULL; } -inline char *config_CategoryHelpGet( int i_value ) +static inline const char *config_CategoryHelpGet( int i_value ) { int i = 0 ; while( categories_array[i].psz_help != NULL ) { if( categories_array[i].i_id == i_value ) { - return categories_array[i].psz_help; + return _(categories_array[i].psz_help); } i++; }