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

+ put access and demux in the right place

diff --git a/modules/access/cdda.c b/modules/access/cdda.c
index 9ecc50210d7bfa5e2fde4e42e47885c40a29e7e1..41635dd92c21450e40be01f05eb0d172ebb4e749 100644 (file)
--- a/modules/access/cdda.c
+++ b/modules/access/cdda.c
@@ -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 );

diff --git a/modules/access/vcd/vcd.c b/modules/access/vcd/vcd.c
index c6bdbab11e556cc9489564e468ce90f43e9d6e0d..68b753feb085b0e6a3cc5fa03d58c2b55e762c54 100644 (file)
--- a/modules/access/vcd/vcd.c
+++ b/modules/access/vcd/vcd.c
@@ -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 );

diff --git a/modules/audio_filter/channel_mixer/headphone.c b/modules/audio_filter/channel_mixer/headphone.c
index 123e917acfe875f961b153bfbfa756ebd1bb8670..5a8d3ed169f8544583a8de9ec04033de38068ee8 100644 (file)
--- a/modules/audio_filter/channel_mixer/headphone.c
+++ b/modules/audio_filter/channel_mixer/headphone.c
@@ -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 );

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index 3d021bd03d1922ea8255fc3bebd62d36df544dda..02f6e5d176e95b8b895650d85c52a89e17f12414 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -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 );

diff --git a/modules/codec/subsdec.c b/modules/codec/subsdec.c
index 07fa17e48f2de3876ce0626afd87eda0547785c1..ec45295d1ea37cb31d9401640c91cf5f87bfc562 100644 (file)
--- a/modules/codec/subsdec.c
+++ b/modules/codec/subsdec.c
@@ -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 );

diff --git a/modules/codec/toolame.c b/modules/codec/toolame.c
index 61a70a16e3e215a52327d31349bacdc2e0b79783..769378d7747770d59adc733aed26b403fee33e42 100644 (file)
--- a/modules/codec/toolame.c
+++ b/modules/codec/toolame.c
@@ -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 );

diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c
index 9a3d831e1ea7dc9ff9bc87b4d6e62c9014937cc8..98df78f9bbcf7ea80164c4aa2ec6e00d46b42882 100644 (file)
--- a/modules/codec/vorbis.c
+++ b/modules/codec/vorbis.c
@@ -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 );

diff --git a/modules/control/gestures.c b/modules/control/gestures.c
index 4936f5a3757cb130ba109c38d87800a3ab746081..46ac6fd19fa7fad74f66249338cf45a21b97f9f0 100644 (file)
--- a/modules/control/gestures.c
+++ b/modules/control/gestures.c
@@ -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 );

diff --git a/modules/control/http.c b/modules/control/http.c
index 61182718936e30045a06275942fc576b77e9116b..7e8c3d0c647ce2fb4f87fd1a2644a91e67732fd1 100644 (file)
--- a/modules/control/http.c
+++ b/modules/control/http.c
@@ -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 );

diff --git a/modules/control/netsync.c b/modules/control/netsync.c
index d939f47c507d8886f641649268faca50e39201af..4ceebe630934cf6fcbfa54494b17ea6d2da2e897 100644 (file)
--- a/modules/control/netsync.c
+++ b/modules/control/netsync.c
@@ -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 );

diff --git a/modules/control/ntservice.c b/modules/control/ntservice.c
index be50dcfec914e7873975bd69ff15805d045dc1b1..12aa6bfdf9d3cc6b5be5a483c289f0e9899e30c1 100644 (file)
--- a/modules/control/ntservice.c
+++ b/modules/control/ntservice.c
@@ -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 );

diff --git a/modules/control/rc.c b/modules/control/rc.c
index 6d5fe5d76e454bb2d9053caf3a27daed2d038417..355f356af2673c70894af512a860992eb8f6d934 100644 (file)
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -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") );

diff --git a/modules/control/showintf.c b/modules/control/showintf.c
index 25772f8c60bf5c102f26742ffaed4a293855c9cc..bc7aafa5009f327810ebfd1deb8dc07405f95294 100644 (file)
--- a/modules/control/showintf.c
+++ b/modules/control/showintf.c
@@ -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 );

diff --git a/modules/control/telnet.c b/modules/control/telnet.c
index 00b41b378e1be699513bdb3505e55bc21576f6e2..6e7bdfdfaad8f0adc928036200e4f73c70c444f9 100644 (file)
--- a/modules/control/telnet.c
+++ b/modules/control/telnet.c
@@ -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 );

diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c
index d1c1fe3e0a24675fcb3da91ba57869fd3cb81a26..ee80ed24c94617e440418a8159dca445e2ced3ed 100644 (file)
--- a/modules/demux/subtitle.c
+++ b/modules/demux/subtitle.c
@@ -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 );

diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c
index c3a275a818197cfce8c352e81051c627c9e83a70..eba0d3ba2cfdafd7f4f33cde11145c5b3023729c 100644 (file)
--- a/modules/gui/ncurses.c
+++ b/modules/gui/ncurses.c
@@ -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 );

diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp
index 7c1e42307dbe4f48db73aa787c6218cb1783be3b..961032f476fedde2b3135aa35a440fbc3dcb0b49 100644 (file)
--- a/modules/gui/skins2/src/skin_main.cpp
+++ b/modules/gui/skins2/src/skin_main.cpp
@@ -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 );

diff --git a/modules/gui/wxwindows/wxwindows.cpp b/modules/gui/wxwindows/wxwindows.cpp
index 28156a21a1a5b15f6546607896c1090fc3578375..47e6bb93d04a4372cefc6eb36d06e62749b06841 100644 (file)
--- a/modules/gui/wxwindows/wxwindows.cpp
+++ b/modules/gui/wxwindows/wxwindows.cpp
@@ -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 );

diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index 76c58d3ba938fe7b889c7327659631ed4eb9f97d..9b6b825300cf079fc1b2e0535b32bbd272a74cf5 100644 (file)
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -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 );
 

diff --git a/modules/mux/mpjpeg.c b/modules/mux/mpjpeg.c
index a80cd3de494e41072d67a6bcefb56003a128f07c..535763fc12e8b02bea1f3ed45a9e029eb3465a24 100644 (file)
--- a/modules/mux/mpjpeg.c
+++ b/modules/mux/mpjpeg.c
@@ -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,

diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c
index 967f60cbbb28cd62730bbc0aabd59d9883cb820a..7bf7813e39348117e476858ba0b07b0a82c1370e 100644 (file)
--- a/modules/services_discovery/sap.c
+++ b/modules/services_discovery/sap.c
@@ -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 );

diff --git a/modules/stream_out/display.c b/modules/stream_out/display.c
index cbb7947da3b275f63bac9b6bb669fc78f2b21b45..59872dde7cd31445f034c875a6e0c1f620f5f8f1 100644 (file)
--- a/modules/stream_out/display.c
+++ b/modules/stream_out/display.c
@@ -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" );

diff --git a/modules/stream_out/es.c b/modules/stream_out/es.c
index 86a40888242a38718774c2a298e143e54c444f4c..eaebd379f8d39647afc4475c72edc08f01df8e8e 100644 (file)
--- a/modules/stream_out/es.c
+++ b/modules/stream_out/es.c
@@ -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" );

diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index d60086ef65a47eb02325e8bc5bd5386c01457bb9..4a88df6de6970fe1caaa547a643a8ac87b56d7ef 100644 (file)
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -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" );

diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c
index b5c377e1584ab70e93b13f804aaba961875de4ec..8682f743146ca16b68490dafe9369b7e8f890190 100644 (file)
--- a/modules/stream_out/standard.c
+++ b/modules/stream_out/standard.c
@@ -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" );

diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c
index 81b50cba71a7eb8b1d87c12af24c060ec9e53770..87f66fc374385c5d41e626ad576c475af1627c3c 100644 (file)
--- a/modules/stream_out/transcode.c
+++ b/modules/stream_out/transcode.c
@@ -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[] = {

diff --git a/modules/video_filter/deinterlace.c b/modules/video_filter/deinterlace.c
index 397c3350717dc7cf6ecf0cfb016717cf7b897d75..b959f6c57ee9dfd998d9ec0bcd31c1330c0d2ad1 100644 (file)
--- a/modules/video_filter/deinterlace.c
+++ b/modules/video_filter/deinterlace.c
@@ -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 );

diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c
index 890f18ea6ff5d91d61db1875ff7dcfb002b2f6ad..b311004f72f7c14a0108ebb09cc53fa176ab453f 100644 (file)
--- a/modules/video_filter/logo.c
+++ b/modules/video_filter/logo.c
@@ -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 );
 

diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c
index f8eedff87350cc27730b528d362754043380f677..c3e41cd48408c7e5f45233937ebbd6f668d1b756 100644 (file)
--- a/modules/video_filter/mosaic.c
+++ b/modules/video_filter/mosaic.c
@@ -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 );

diff --git a/modules/video_filter/motiondetect.c b/modules/video_filter/motiondetect.c
index a0873b46e17e560e1c99b4a33d924887d036f513..4daeb436a2d7fe042de31c7511e33eff5128d4dc 100644 (file)
--- a/modules/video_filter/motiondetect.c
+++ b/modules/video_filter/motiondetect.c
@@ -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 );

diff --git a/modules/video_filter/wall.c b/modules/video_filter/wall.c
index e9ceb2b835cec31b60313b50302508dd0024c055..8ebc34c3b9804b3c90df102c0a958a0fb6069b04 100644 (file)
--- a/modules/video_filter/wall.c
+++ b/modules/video_filter/wall.c
@@ -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 );

diff --git a/modules/video_output/aa.c b/modules/video_output/aa.c
index 8a6f9f37e6e6f476be3a8707612758a038c98598..f137f61e31dced067a477b98f46b3fa0523ac1cc 100644 (file)
--- a/modules/video_output/aa.c
+++ b/modules/video_output/aa.c
@@ -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") );

diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
index db68c29f9a78d60450fb73f3dfb65323929b6852..013338e90ea82aacaea027eef7a72a35be993d67 100644 (file)
--- a/modules/video_output/caca.c
+++ b/modules/video_output/caca.c
@@ -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();

diff --git a/modules/video_output/directx/directx.c b/modules/video_output/directx/directx.c
index 72c10468eb7486e22c1e5a64575b12e321c89ff2..61c604798f4896501c7a6626a1cc2bec667444db 100644 (file)
--- a/modules/video_output/directx/directx.c
+++ b/modules/video_output/directx/directx.c
@@ -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,

diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c
index 70eedc9d4d53398e24913559fe518705a49372cc..2d20a8870ed42681ff7e10c4bebc50ed2c3b1050 100644 (file)
--- a/modules/video_output/fb.c
+++ b/modules/video_output/fb.c
@@ -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") );

diff --git a/modules/visualization/goom.c b/modules/visualization/goom.c
index 88b3c8600bf57eb499457092c200ead1819d2e78..f9d9e0a72d901884e5d0f9b002b635794b595267 100644 (file)
--- a/modules/visualization/goom.c
+++ b/modules/visualization/goom.c
@@ -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 );

diff --git a/modules/visualization/visual/visual.c b/modules/visualization/visual/visual.c
index a68b139033fc490f72625bfc0f971ba25c769b4c..5d10f61888beab90a0c4197e099ea92d2af4fb1e 100644 (file)
--- a/modules/visualization/visual/visual.c
+++ b/modules/visualization/visual/visual.c
@@ -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") );

diff --git a/src/libvlc.h b/src/libvlc.h
index 1fb7ae169b79b4d990812342d4bad488b21c551b..34422a7a07c4d4d559eb0e2a4284ade2e913b12a 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -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,