Preferences update :

- Sorted marq options
- A52 & DTS are audio decoders
- Moved freetype to subtitles/OSD

(last 2 suggested by Anil)

diff --git a/include/vlc_config_cat.h b/include/vlc_config_cat.h
index bd4cef36c32829a6c90a92cad46707c295eb65a8..fbd9654969f8fd72bfd91c48a6d07aa265ecbf69 100644 (file)
--- a/include/vlc_config_cat.h
+++ b/include/vlc_config_cat.h
@@ -293,7 +293,7 @@ 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 },
+//    { SUBCAT_VIDEO_TEXT, TEXT_TITLE, TEXT_HELP },
 
     { CAT_INPUT, INPUT_TITLE, INPUT_HELP },
     { SUBCAT_INPUT_ACCESS, ACCESS_TITLE, ACCESS_HELP },

diff --git a/modules/audio_filter/converter/a52tofloat32.c b/modules/audio_filter/converter/a52tofloat32.c
index 48625a770edc404bc53de67e34b909ecaf81d192..00f37a1a644e82a51c0a9836780d62b67eacbd21 100644 (file)
--- a/modules/audio_filter/converter/a52tofloat32.c
+++ b/modules/audio_filter/converter/a52tofloat32.c
@@ -102,8 +102,8 @@ struct filter_sys_t
 vlc_module_begin();
     set_shortname( _("A/52") );
     set_description( _("ATSC A/52 (AC-3) audio decoder") );
-    set_category( CAT_AUDIO );
-    set_subcategory( SUBCAT_AUDIO_MISC );
+    set_category( CAT_INPUT );
+    set_subcategory( SUBCAT_INPUT_ACODEC );
     add_bool( "a52-dynrng", 1, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, VLC_FALSE );
     set_capability( "audio filter", 100 );
     set_callbacks( Create, Destroy );

diff --git a/modules/audio_filter/converter/dtstofloat32.c b/modules/audio_filter/converter/dtstofloat32.c
index b23b051ee697c2957a8283cb14af07d60fd96d4c..a76a21c0ff816975b8e93dafb7f6797cebbcf2b8 100644 (file)
--- a/modules/audio_filter/converter/dtstofloat32.c
+++ b/modules/audio_filter/converter/dtstofloat32.c
@@ -87,8 +87,9 @@ struct filter_sys_t
     "listening room.")
 
 vlc_module_begin();
-    set_category( CAT_AUDIO );
-    set_subcategory( SUBCAT_AUDIO_MISC );
+    set_category( CAT_INPUT );
+    set_subcategory( SUBCAT_INPUT_ACODEC );
+    set_shortname( _("DTS" ) );
     set_description( _("DTS Coherent Acoustics audio decoder") );
     add_bool( "dts-dynrng", 1, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, VLC_FALSE );
     set_capability( "audio filter", 100 );
@@ -101,7 +102,7 @@ vlc_module_begin();
 vlc_module_end();
 
 /*****************************************************************************
- * Create: 
+ * Create:
  *****************************************************************************/
 static int Create( vlc_object_t *p_this )
 {

diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index 057a7db86730e7e77c8f2a4d2e03cc63e169ee54..a769614c66128b41169514d3552ae3b49057ad3d 100644 (file)
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -110,10 +110,10 @@ static char *ppsz_color_descriptions[] = {
   N_("Lime"), N_("Purple"), N_("Navy"), N_("Blue"), N_("Aqua") };
 
 vlc_module_begin();
-    set_shortname( _("Freetype"));
+    set_shortname( _("Text renderer"));
     set_description( _("Freetype2 font renderer") );
     set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_TEXT );
+    set_subcategory( SUBCAT_VIDEO_SUBPIC );
 
     add_file( "freetype-font", DEFAULT_FONT, NULL, FONT_TEXT, FONT_LONGTEXT,
               VLC_FALSE );

diff --git a/modules/video_filter/marq.c b/modules/video_filter/marq.c
index 50479e0b2553b28099c65168df7ec534331eccfb..707990fae301fac689facbd87084f5ace0f8889a 100644 (file)
--- a/modules/video_filter/marq.c
+++ b/modules/video_filter/marq.c
@@ -83,7 +83,7 @@ struct filter_sys_t
 #define TIMEOUT_LONGTEXT N_("Defines the time the marquee must remain " \
                             "displayed, in milliseconds. Default value is " \
                             "0 (remain forever).")
-#define OPACITY_TEXT N_("Opacity, 0..255")
+#define OPACITY_TEXT N_("Opacity")
 #define OPACITY_LONGTEXT N_("The opacity (inverse of transparency) of " \
     "overlay text. 0 = transparent, 255 = totally opaque. " )
 #define SIZE_TEXT N_("Font size, pixels")
@@ -116,11 +116,13 @@ vlc_module_begin();
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_SUBPIC );
     add_string( "marq-marquee", "Marquee", NULL, MSG_TEXT, MSG_LONGTEXT, VLC_FALSE );
+
+    set_section( N_("Position"), NULL );
     add_integer( "marq-x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, VLC_FALSE );
     add_integer( "marq-y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, VLC_FALSE );
-    add_integer( "marq-timeout", 0, NULL, TIMEOUT_TEXT, TIMEOUT_LONGTEXT,
-                 VLC_FALSE );
     add_integer( "marq-position", 5, NULL, POS_TEXT, POS_LONGTEXT, VLC_TRUE );
+
+    set_section( N_("Font"), NULL );
     /* 5 sets the default to top [1] left [4] */
     change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
     add_integer_with_range( "marq-opacity", 255, 0, 255, NULL,
@@ -129,6 +131,10 @@ vlc_module_begin();
         change_integer_list( pi_color_values, ppsz_color_descriptions, 0 );
     add_integer( "marq-size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT, VLC_FALSE );
 
+    set_section( N_("Misc"), NULL );
+    add_integer( "marq-timeout", 0, NULL, TIMEOUT_TEXT, TIMEOUT_LONGTEXT,
+                 VLC_FALSE );
+
     set_description( _("Marquee display sub filter") );
     add_shortcut( "marq" );
 vlc_module_end();

diff --git a/src/libvlc.h b/src/libvlc.h
index 34422a7a07c4d4d559eb0e2a4284ade2e913b12a..aab81c2c1014d3ec93724c679f01d06272bd42c2 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -976,7 +976,7 @@ vlc_module_begin();
     add_module_list_cat( "sub-filter", SUBCAT_VIDEO_SUBPIC, NULL, NULL,
                 SUB_FILTER_TEXT, SUB_FILTER_LONGTEXT, VLC_TRUE );
 
-    set_subcategory( SUBCAT_VIDEO_TEXT );
+//    set_subcategory( SUBCAT_VIDEO_TEXT );
 
     /* Input options */
     set_category( CAT_INPUT );