Commit 2cf38dd9 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* Renamed "Advanced" subcat of "Input / Codecs" into "General" and made all...

* Renamed "Advanced" subcat of "Input / Codecs" into "General" and made all the advanced options within it hidden.

parent 1ceb883e
......@@ -80,13 +80,13 @@
#define SUBCAT_VIDEO_SUBPIC 305
#define CAT_INPUT 4
#define SUBCAT_INPUT_ACCESS 401
#define SUBCAT_INPUT_ACCESS_FILTER 402
#define SUBCAT_INPUT_DEMUX 403
#define SUBCAT_INPUT_VCODEC 404
#define SUBCAT_INPUT_ACODEC 405
#define SUBCAT_INPUT_SCODEC 406
#define SUBCAT_INPUT_ADVANCED 407
#define SUBCAT_INPUT_GENERAL 401
#define SUBCAT_INPUT_ACCESS 402
#define SUBCAT_INPUT_ACCESS_FILTER 403
#define SUBCAT_INPUT_DEMUX 404
#define SUBCAT_INPUT_VCODEC 405
#define SUBCAT_INPUT_ACODEC 406
#define SUBCAT_INPUT_SCODEC 407
#define CAT_SOUT 5
#define SUBCAT_SOUT_GENERAL 501
......
......@@ -119,8 +119,8 @@
#define SDEC_TITLE N_( "Other codecs")
#define SDEC_HELP N_( "Settings for audio+video and miscellaneous decoders and encoders" )
#define ADVANCED_TITLE N_("Advanced")
#define ADVANCED_HELP N_( "Advanced input settings. Use with care." )
#define ADVANCED_TITLE N_("General")
#define ADVANCED_HELP N_( "General input settings. Use with care." )
/* Sout */
#define SOUT_TITLE N_( "Stream output" )
......@@ -302,13 +302,13 @@ static struct config_category_t categories_array[] =
// { SUBCAT_VIDEO_TEXT, TEXT_TITLE, TEXT_HELP },
{ CAT_INPUT, INPUT_TITLE, INPUT_HELP },
{ SUBCAT_INPUT_GENERAL, ADVANCED_TITLE, ADVANCED_HELP },
{ SUBCAT_INPUT_ACCESS, ACCESS_TITLE, ACCESS_HELP },
{ SUBCAT_INPUT_ACCESS_FILTER, ACCESS_FILTER_TITLE, ACCESS_FILTER_HELP },
{ SUBCAT_INPUT_DEMUX, DEMUX_TITLE, DEMUX_HELP },
{ SUBCAT_INPUT_VCODEC, VDEC_TITLE, VDEC_HELP },
{ SUBCAT_INPUT_ACODEC, ADEC_TITLE, ADEC_HELP },
{ SUBCAT_INPUT_SCODEC, SDEC_TITLE, SDEC_HELP },
{ SUBCAT_INPUT_ADVANCED, ADVANCED_TITLE, ADVANCED_HELP },
{ CAT_SOUT, SOUT_TITLE, SOUT_HELP },
{ SUBCAT_SOUT_GENERAL, GENERAL_TITLE, SOUT_GENERAL_HELP },
......
......@@ -103,7 +103,7 @@ vlc_module_begin();
set_description( _("UDP/IPv4 network abstraction layer") );
set_capability( "network", 50 );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ADVANCED );
set_subcategory( SUBCAT_INPUT_GENERAL );
set_callbacks( OpenUDP, NULL );
add_string( "miface-addr", NULL, NULL, MIFACE_TEXT, MIFACE_LONGTEXT, VLC_TRUE );
vlc_module_end();
......
......@@ -74,7 +74,7 @@ struct filter_sys_t
#define POSX_LONGTEXT N_("X offset, from the left screen edge" )
#define POSY_TEXT N_("Y offset, from the top")
#define POSY_LONGTEXT N_("Y offset, down from the top" )
#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")
......
......@@ -1068,23 +1068,7 @@ vlc_module_begin();
/* Input options */
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACCESS );
add_category_hint( N_("Input"), INPUT_CAT_LONGTEXT , VLC_FALSE );
add_module( "access", "access2", NULL, NULL, ACCESS_TEXT,
ACCESS_LONGTEXT, VLC_TRUE );
set_subcategory( SUBCAT_INPUT_ACCESS_FILTER );
add_module_list_cat( "access-filter", SUBCAT_INPUT_ACCESS_FILTER, NULL, NULL,
ACCESS_FILTER_TEXT, ACCESS_FILTER_LONGTEXT, VLC_FALSE );
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 );
set_subcategory( SUBCAT_INPUT_ADVANCED );
set_subcategory( SUBCAT_INPUT_GENERAL );
set_section( N_( "Track settings" ), NULL );
add_integer( "program", 0, NULL,
......@@ -1170,9 +1154,9 @@ vlc_module_begin();
set_section( N_( "Advanced" ), NULL );
add_integer( "cr-average", 40, NULL, CR_AVERAGE_TEXT,
CR_AVERAGE_LONGTEXT, VLC_FALSE );
CR_AVERAGE_LONGTEXT, VLC_TRUE );
add_integer( "clock-synchro", -1, NULL, CLOCK_SYNCHRO_TEXT,
CLOCK_SYNCHRO_LONGTEXT, VLC_FALSE );
CLOCK_SYNCHRO_LONGTEXT, VLC_TRUE );
change_integer_list( pi_clock_values, ppsz_clock_descriptions, 0 );
/* Decoder options */
......@@ -1182,6 +1166,23 @@ vlc_module_begin();
add_string( "encoder", NULL, NULL, ENCODER_TEXT,
ENCODER_LONGTEXT, VLC_TRUE );
set_subcategory( SUBCAT_INPUT_ACCESS );
add_category_hint( N_("Input"), INPUT_CAT_LONGTEXT , VLC_FALSE );
add_module( "access", "access2", NULL, NULL, ACCESS_TEXT,
ACCESS_LONGTEXT, VLC_TRUE );
set_subcategory( SUBCAT_INPUT_ACCESS_FILTER );
add_module_list_cat( "access-filter", SUBCAT_INPUT_ACCESS_FILTER, NULL, NULL,
ACCESS_FILTER_TEXT, ACCESS_FILTER_LONGTEXT, VLC_FALSE );
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 );
/* Stream output options */
set_category( CAT_SOUT );
......
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