Commit ba9826ca authored by Clément Stenac's avatar Clément Stenac

Preferences consistency fixes by Christophe Mutricy <xtophe at nxtelevision d0t com>

+ put access and demux in the right place
parent 497ea18f
......@@ -45,6 +45,7 @@ static void Close( vlc_object_t * );
"value should be set in milliseconds units." )
vlc_module_begin();
set_shortname( _("Audio CD"));
set_description( _("Audio CD input") );
set_capability( "access2", 10 );
set_category( CAT_INPUT );
......
......@@ -43,6 +43,7 @@ static void Close( vlc_object_t * );
"value should be set in milliseconds units." )
vlc_module_begin();
set_shortname( _("VCD"));
set_description( _("VCD input") );
set_capability( "access2", 60 );
set_callbacks( Open, Close );
......
......@@ -58,7 +58,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
"Distance between front left speaker and listener in meters.")
vlc_module_begin();
set_description( N_("headphone channel mixer with virtual spatialization effect") );
set_description( N_("Headphone channel mixer with virtual spatialization effect") );
set_shortname( _("Headphone effect") );
set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_AFILTER );
......
......@@ -76,17 +76,17 @@ static char *enc_hq_list_text[] = { N_("rd"), N_("bits"), N_("simple") };
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_shortname( _("Ffmpeg"));
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_SCODEC );
/* decoder main module */
#if defined(MODULE_NAME_is_ffmpegaltivec) \
|| (defined(CAN_COMPILE_ALTIVEC) && !defined(NO_ALTIVEC_IN_FFMPEG))
set_description( _("AltiVec ffmpeg audio/video decoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") );
set_description( _("AltiVec ffmpeg audio/video decoder/encoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") );
/*add_requirement( ALTIVEC );*/
set_capability( "decoder", 71 );
#else
set_description( _("ffmpeg audio/video decoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") );
set_description( _("Ffmpeg audio/video decoder/encoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") );
set_capability( "decoder", 70 );
#endif
set_section( N_("Decoding") , NULL );
......
......@@ -89,7 +89,8 @@ static char *ppsz_justification_text[] = {N_("Center"),N_("Left"),N_("Right")};
#define ALIGN_LONGTEXT N_("Set the justification of subtitles")
vlc_module_begin();
set_description( _("text subtitles decoder") );
set_shortname( _("Subtitles"));
set_description( _("Text subtitles decoder") );
set_capability( "decoder", 50 );
set_callbacks( OpenDecoder, CloseDecoder );
set_category( CAT_INPUT );
......
......@@ -60,7 +60,8 @@ static block_t *Encode ( encoder_t *, aout_buffer_t * );
"By default the encoding is CBR." )
vlc_module_begin();
set_description( _("libtoolame audio encoder") );
set_shortname( _("Toolame"));
set_description( _("Libtoolame audio encoder") );
set_capability( "encoder", 50 );
set_callbacks( OpenEncoder, CloseEncoder );
set_category( CAT_INPUT );
......
......@@ -141,7 +141,7 @@ static block_t *Encode ( encoder_t *, aout_buffer_t * );
"Allows you to force a constant bitrate encoding (CBR)." )
vlc_module_begin();
set_shortname( _("Vorbis"));
set_description( _("Vorbis audio decoder") );
#ifdef MODULE_NAME_IS_tremor
set_capability( "decoder", 90 );
......
......@@ -87,6 +87,7 @@ static char *button_list[] = { "left", "middle", "right" };
static char *button_list_text[] = { N_("Left"), N_("Middle"), N_("Right") };
vlc_module_begin();
set_shortname( _("Gestures"));
set_category( CAT_INTERFACE );
set_subcategory( SUBCAT_INTERFACE_CONTROL );
add_integer( "gestures-threshold", 30, NULL, THRESHOLD_TEXT, THRESHOLD_LONGTEXT, VLC_TRUE );
......
......@@ -89,6 +89,7 @@ static void Close( vlc_object_t * );
#define CRL_LONGTEXT N_( "HTTP interace Certificates Revocation List file" )
vlc_module_begin();
set_shortname( _("HTTP"));
set_description( _("HTTP remote control interface") );
set_category( CAT_INTERFACE );
set_subcategory( SUBCAT_INTERFACE_GENERAL );
......
......@@ -87,6 +87,7 @@ static mtime_t GetClockRef( intf_thread_t *, mtime_t );
"the master client used for the network synchronisation." )
vlc_module_begin();
set_shortname( _("Netsync"));
set_description( _("Network synchronisation") );
set_category( CAT_INTERFACE );
set_subcategory( SUBCAT_INTERFACE_CONTROL );
......
......@@ -58,6 +58,7 @@ static void Close ( vlc_object_t * );
"(common values are: logger, sap, rc, http)")
vlc_module_begin();
set_shortname( _("NT Service"));
set_description( _("Windows Service interface") );
set_category( CAT_INTERFACE );
set_subcategory( SUBCAT_INTERFACE_CONTROL );
......
......@@ -149,6 +149,7 @@ void __msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... )
#endif
vlc_module_begin();
set_shortname( _("RC"));
set_category( CAT_INTERFACE );
set_subcategory( SUBCAT_INTERFACE_GENERAL );
set_description( _("Remote control interface") );
......
......@@ -63,6 +63,7 @@ static int MouseEvent( vlc_object_t *, char const *,
#define THRESHOLD_LONGTEXT N_( "Height of the zone triggering the interface" )
vlc_module_begin();
set_shortname( _("Showintf"));
set_category( CAT_INTERFACE );
set_subcategory( SUBCAT_INTERFACE_CONTROL );
add_integer( "showintf-threshold", 10, NULL, THRESHOLD_TEXT, THRESHOLD_LONGTEXT, VLC_TRUE );
......
......@@ -82,13 +82,14 @@ static void Close( vlc_object_t * );
#define TELNETPWD_LONGTEXT N_( "Default to admin" )
vlc_module_begin();
set_shortname( _("Telnet"));
set_category( CAT_INTERFACE );
set_subcategory( SUBCAT_INTERFACE_GENERAL );
add_integer( "telnet-port", 4212, NULL, TELNETPORT_TEXT,
TELNETPORT_LONGTEXT, VLC_TRUE );
add_string( "telnet-password", "admin", NULL, TELNETPWD_TEXT,
TELNETPWD_LONGTEXT, VLC_TRUE );
set_description( _("Telnet remote control interface") );
set_description( _("VLM remote control interface") );
add_category_hint( "VLM", NULL, VLC_FALSE );
set_capability( "interface", 0 );
set_callbacks( Open , Close );
......
......@@ -58,6 +58,7 @@ static char *ppsz_sub_type[] =
};
vlc_module_begin();
set_shortname( _("Subtitles"));
set_description( _("Text subtitles demux") );
set_capability( "demux2", 0 );
set_category( CAT_INPUT );
......
......@@ -96,7 +96,8 @@ static void ReadDir ( intf_thread_t * );
"will show you initially.")
vlc_module_begin();
set_description( _("ncurses interface") );
set_shorname( _("Ncurses"));
set_description( _("Ncurses interface") );
set_capability( "interface", 10 );
set_category( CAT_INTERFACE );
set_subcategory( SUBCAT_INTERFACE_GENERAL );
......
......@@ -350,7 +350,7 @@ vlc_module_begin();
add_bool( "skins2-transparency", VLC_FALSE, NULL, SKINS2_TRANSPARENCY,
SKINS2_TRANSPARENCY_LONG, VLC_FALSE );
#endif
set_shorname( _("Skins"));
set_description( _("Skinnable Interface") );
set_capability( "interface", 30 );
set_callbacks( Open, Close );
......
......@@ -96,6 +96,7 @@ vlc_module_begin();
#else
int i_score = getenv( "DISPLAY" ) == NULL ? 15 : 150;
#endif
set_shortname( (char*) _("wxWindows"));
set_description( (char *) _("wxWindows interface module") );
set_category( CAT_INTERFACE );
set_subcategory( SUBCAT_INTERFACE_GENERAL );
......
......@@ -104,7 +104,8 @@ static char *ppsz_color_descriptions[] = { N_("Black"), N_("Gray"), N_("Silver")
N_("Navy"), N_("Blue"), N_("Aqua") };
vlc_module_begin();
set_description( _("freetype2 font renderer") );
set_shortname( _("Freetype"));
set_description( _("Freetype2 font renderer") );
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_TEXT );
......
......@@ -46,6 +46,7 @@ static void Close ( vlc_object_t * );
#define SOUT_CFG_PREFIX "sout-mpjpeg-"
vlc_module_begin();
set_shortname( _("MPJPEG"));
set_description( _("Multipart jpeg muxer") );
set_capability( "sout mux", 5 );
add_string( SOUT_CFG_PREFIX "separator", "--myboundary", NULL,
......
......@@ -103,6 +103,7 @@
static void CloseDemux ( vlc_object_t * );
vlc_module_begin();
set_shortname( _("SAP"));
set_description( _("SAP announces") );
set_category( CAT_PLAYLIST );
set_subcategory( SUBCAT_PLAYLIST_SD );
......
......@@ -47,6 +47,7 @@ static void Close( vlc_object_t * );
#define SOUT_CFG_PREFIX "sout-display-"
vlc_module_begin();
set_shortname( _("Display"));
set_description( _("Display stream output") );
set_capability( "sout stream", 50 );
add_shortcut( "display" );
......
......@@ -75,6 +75,7 @@ static void Close ( vlc_object_t * );
#define SOUT_CFG_PREFIX "sout-es-"
vlc_module_begin();
set_shortname( _("ES"));
set_description( _("Elementary stream output") );
set_capability( "sout stream", 50 );
add_shortcut( "es" );
......
......@@ -84,6 +84,7 @@ static void Close( vlc_object_t * );
#define SOUT_CFG_PREFIX "sout-rtp-"
vlc_module_begin();
set_shortname( _("RTP"));
set_description( _("RTP stream output") );
set_capability( "sout stream", 0 );
add_shortcut( "rtp" );
......
......@@ -75,6 +75,7 @@ static void Close ( vlc_object_t * );
#define SOUT_CFG_PREFIX "sout-standard-"
vlc_module_begin();
set_shortname( _("Standard"));
set_description( _("Standard stream output") );
set_capability( "sout stream", 50 );
add_shortcut( "standard" );
......
......@@ -130,13 +130,14 @@ static void Close( vlc_object_t * );
#define SOUT_CFG_PREFIX "sout-transcode-"
vlc_module_begin();
set_shortname( _("Transcode"));
set_description( _("Transcode stream output") );
set_capability( "sout stream", 50 );
add_shortcut( "transcode" );
set_callbacks( Open, Close );
set_category( CAT_SOUT );
set_subcategory( SUBCAT_SOUT_STREAM );
set_section( N_("Video"), NULL );
add_string( SOUT_CFG_PREFIX "venc", NULL, NULL, VENC_TEXT,
VENC_LONGTEXT, VLC_FALSE );
add_string( SOUT_CFG_PREFIX "vcodec", NULL, NULL, VCODEC_TEXT,
......@@ -163,6 +164,7 @@ vlc_module_begin();
add_integer( SOUT_CFG_PREFIX "cropright", 0, NULL, CROPRIGHT_TEXT,
CROPRIGHT_LONGTEXT, VLC_TRUE );
set_section( N_("Audio"), NULL );
add_string( SOUT_CFG_PREFIX "aenc", NULL, NULL, AENC_TEXT,
AENC_LONGTEXT, VLC_FALSE );
add_string( SOUT_CFG_PREFIX "acodec", NULL, NULL, ACODEC_TEXT,
......@@ -173,21 +175,24 @@ vlc_module_begin();
ACHANS_LONGTEXT, VLC_FALSE );
add_integer( SOUT_CFG_PREFIX "samplerate", 0, NULL, ARATE_TEXT,
ARATE_LONGTEXT, VLC_TRUE );
add_bool( SOUT_CFG_PREFIX "audio-sync", 0, NULL, ASYNC_TEXT,
ASYNC_LONGTEXT, VLC_FALSE );
set_section( N_("Overlays/Subtitles"), NULL );
add_string( SOUT_CFG_PREFIX "senc", NULL, NULL, SENC_TEXT,
SENC_LONGTEXT, VLC_FALSE );
add_string( SOUT_CFG_PREFIX "scodec", NULL, NULL, SCODEC_TEXT,
SCODEC_LONGTEXT, VLC_FALSE );
add_bool( SOUT_CFG_PREFIX "soverlay", 0, NULL, SCODEC_TEXT,
SCODEC_LONGTEXT, VLC_FALSE );
add_string( SOUT_CFG_PREFIX "sfilter", NULL, NULL, SFILTER_TEXT,
SFILTER_LONGTEXT, VLC_FALSE );
add_module_list_cat( SOUT_CFG_PREFIX "sfilter", SUBCAT_VIDEO_SUBPIC,
NULL, NULL,
SFILTER_TEXT, SFILTER_LONGTEXT, VLC_FALSE );
set_section( N_("Miscellaneous"), NULL );
add_integer( SOUT_CFG_PREFIX "threads", 0, NULL, THREADS_TEXT,
THREADS_LONGTEXT, VLC_TRUE );
add_bool( SOUT_CFG_PREFIX "audio-sync", 0, NULL, ASYNC_TEXT,
ASYNC_LONGTEXT, VLC_FALSE );
vlc_module_end();
static const char *ppsz_sout_options[] = {
......
......@@ -97,6 +97,7 @@ static char *mode_list_text[] = { N_("Discard"), N_("Blend"), N_("Mean"),
vlc_module_begin();
set_description( _("Deinterlacing video filter") );
set_shortname( N_("Deinterlace" ));
set_capability( "video filter", 0 );
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_VFILTER );
......
......@@ -89,7 +89,7 @@ vlc_module_begin();
set_capability( "video filter", 0 );
set_shortname( N_("Logo overlay") );
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_VFILTER );
set_subcategory( SUBCAT_VIDEO_SUBPIC );
add_shortcut( "logo" );
set_callbacks( Create, Destroy );
......
......@@ -105,8 +105,6 @@ vlc_module_begin();
set_description( _("Mosaic video sub filter") );
set_shortname( N_("Mosaic") );
set_capability( "sub filter", 0 );
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_SUBPIC );
set_callbacks( CreateFilter, DestroyFilter );
add_integer( "mosaic-alpha", 255, NULL, ALPHA_TEXT, ALPHA_LONGTEXT, VLC_FALSE );
......
......@@ -60,8 +60,6 @@ vlc_module_begin();
set_description( _("Motion detect video filter") );
set_shortname( N_( "Motion detect" ));
set_capability( "video filter", 0 );
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_VFILTER );
add_integer( "motiondetect-history", 1, NULL, HISTORY_TEXT,
HISTORY_LONGTEXT, VLC_FALSE );
......
......@@ -66,7 +66,7 @@ static int SendEvents( vlc_object_t *, char const *,
#define ASPECT_LONGTEXT N_("The aspect ratio of the individual displays building the display wall")
vlc_module_begin();
set_description( _("wall video filter") );
set_description( _("Wall video filter") );
set_shortname( N_("Image wall" ));
set_capability( "video filter", 0 );
set_category( CAT_VIDEO );
......
......@@ -52,6 +52,7 @@ static void SetPalette ( vout_thread_t *, uint16_t *, uint16_t *, uint16_t *
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_shortname( _("Ascii Art"));
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_VOUT );
set_description( _("ASCII-art video output") );
......
......@@ -51,9 +51,10 @@ static void Display ( vout_thread_t *, picture_t * );
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_shortname( _("Caca"));
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_VOUT );
set_description( _("color ASCII art video output") );
set_description( _("Color ASCII art video output") );
set_capability( "video output", 12 );
set_callbacks( Create, Destroy );
vlc_module_end();
......
......@@ -140,6 +140,7 @@ static char *ppsz_dev[] = { "" };
static char *ppsz_dev_text[] = { N_("Default") };
vlc_module_begin();
set_shortname( _("DirectX"))
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_VOUT );
add_bool( "directx-hw-yuv", 1, NULL, HW_YUV_TEXT, HW_YUV_LONGTEXT,
......
......@@ -70,6 +70,9 @@ static void GfxMode ( int i_tty );
"for rendering (usually /dev/fb0).")
vlc_module_begin();
set_shortname( _("Fb"));
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_VOUT );
add_file( FB_DEV_VAR, "/dev/fb0", NULL, DEVICE_TEXT, DEVICE_LONGTEXT,
VLC_FALSE );
set_description( _("GNU/Linux console framebuffer video output") );
......
......@@ -67,6 +67,7 @@ static void Close ( vlc_object_t * );
#define MAX_SPEED 10
vlc_module_begin();
set_shortname( _("Goom"));
set_description( _("Goom effect") );
set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_VISUAL );
......
......@@ -72,6 +72,7 @@ static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
vlc_module_begin();
set_shortname( _("Visualizer"));
set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_VISUAL );
set_description( _("Visualizer filter") );
......
......@@ -895,10 +895,10 @@ vlc_module_begin();
NULL, AUDIO_FILTER_TEXT,
AUDIO_FILTER_LONGTEXT, VLC_FALSE );
set_subcategory( SUBCAT_AUDIO_VISUAL );
add_string( "audio-visual", 0, NULL,AUDIO_VISUAL_TEXT,
add_module( "audio-visual", "visualization",NULL, NULL,AUDIO_VISUAL_TEXT,
AUDIO_VISUAL_LONGTEXT, VLC_FALSE );
set_subcategory( SUBCAT_AUDIO_MISC );
add_module( "audio-channel-mixer", "audio filter", NULL, NULL,
add_module_cat( "audio-channel-mixer", SUBCAT_AUDIO_MISC, NULL, NULL,
AUDIO_CHANNEL_MIXER, AUDIO_CHANNEL_MIXER_LONGTEXT, VLC_FALSE );
change_short('A');
......@@ -973,7 +973,7 @@ vlc_module_begin();
SUB_MARGIN_LONGTEXT, VLC_TRUE );
set_section( N_( "Overlays" ) , NULL );
add_module( "sub-filter", "sub filter", NULL, NULL,
add_module_list_cat( "sub-filter", SUBCAT_VIDEO_SUBPIC, NULL, NULL,
SUB_FILTER_TEXT, SUB_FILTER_LONGTEXT, VLC_TRUE );
set_subcategory( SUBCAT_VIDEO_TEXT );
......@@ -981,7 +981,11 @@ vlc_module_begin();
/* Input options */
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACCESS );
add_module( "access", "access2", NULL, NULL, ACCESS_TEXT,
ACCESS_LONGTEXT, VLC_TRUE );
set_subcategory( SUBCAT_INPUT_DEMUX );
add_module( "demux", "demux2", NULL, NULL, DEMUX_TEXT,
DEMUX_LONGTEXT, VLC_TRUE );
set_subcategory( SUBCAT_INPUT_VCODEC );
set_subcategory( SUBCAT_INPUT_ACODEC );
set_subcategory( SUBCAT_INPUT_SCODEC );
......@@ -1075,9 +1079,9 @@ vlc_module_begin();
/* Decoder options */
add_category_hint( N_("Decoders"), CODEC_CAT_LONGTEXT , VLC_TRUE );
add_module( "codec", "decoder", NULL, NULL, CODEC_TEXT,
add_string( "codec", NULL, NULL, CODEC_TEXT,
CODEC_LONGTEXT, VLC_TRUE );
add_module( "encoder", "encoder", NULL, NULL, ENCODER_TEXT,
add_string( "encoder", NULL, NULL, ENCODER_TEXT,
ENCODER_LONGTEXT, VLC_TRUE );
......@@ -1107,7 +1111,7 @@ vlc_module_begin();
add_module( "access_output", "sout access", NULL, NULL,
ACCESS_OUTPUT_TEXT, ACCESS_OUTPUT_LONGTEXT, VLC_TRUE );
set_subcategory( SUBCAT_SOUT_PACKETIZER );
add_module( "packetizer", "packetizer", NULL, NULL,
add_module( "packetizer","packetizer", NULL, NULL,
PACKETIZER_TEXT, PACKETIZER_LONGTEXT, VLC_TRUE );
set_subcategory( SUBCAT_SOUT_SAP );
......@@ -1134,10 +1138,6 @@ vlc_module_begin();
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,
ACCESS_LONGTEXT, VLC_TRUE );
add_module( "demux", "demux", NULL, NULL, DEMUX_TEXT,
DEMUX_LONGTEXT, VLC_TRUE );
add_bool( "minimize-threads", 0, NULL, MINIMIZE_THREADS_TEXT,
MINIMIZE_THREADS_LONGTEXT, VLC_TRUE );
add_bool( "plugins-cache", VLC_TRUE, NULL, PLUGINS_CACHE_TEXT,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment