Commit ef235f26 authored by zorglub's avatar zorglub
Browse files

Preferences update :

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

(last 2 suggested by Anil)
parent f7405aa1
......@@ -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 },
......
......@@ -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 );
......
......@@ -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 )
{
......
......@@ -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 );
......
......@@ -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();
......
......@@ -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 );
......
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