From ef235f269c9c766ad296466a4b5461d053bc6efe Mon Sep 17 00:00:00 2001 From: =?utf8?q?Cl=C3=A9ment=20Stenac?= Date: Thu, 10 Mar 2005 00:17:33 +0000 Subject: [PATCH] Preferences update : - Sorted marq options - A52 & DTS are audio decoders - Moved freetype to subtitles/OSD (last 2 suggested by Anil) --- include/vlc_config_cat.h | 2 +- modules/audio_filter/converter/a52tofloat32.c | 4 ++-- modules/audio_filter/converter/dtstofloat32.c | 7 ++++--- modules/misc/freetype.c | 4 ++-- modules/video_filter/marq.c | 12 +++++++++--- src/libvlc.h | 2 +- 6 files changed, 19 insertions(+), 12 deletions(-) diff --git a/include/vlc_config_cat.h b/include/vlc_config_cat.h index bd4cef36c3..fbd9654969 100644 --- 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 48625a770e..00f37a1a64 100644 --- 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 b23b051ee6..a76a21c0ff 100644 --- 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 057a7db867..a769614c66 100644 --- 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 50479e0b25..707990fae3 100644 --- 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 34422a7a07..aab81c2c10 100644 --- 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 ); -- 2.39.2