Commit ffc45b94 authored by Clément Stenac's avatar Clément Stenac

Fix a bunch of preferences errors

 - Missing value lists
 - advanced / non-advanced problems
 - description problems
 - tyops
parent 9f516fa2
...@@ -97,13 +97,15 @@ ...@@ -97,13 +97,15 @@
#define ACCESS_TITLE N_( "Access modules" ) #define ACCESS_TITLE N_( "Access modules" )
#define ACCESS_HELP N_( \ #define ACCESS_HELP N_( \
"Settings related to the various access methods used by VLC.\n" \ "Settings related to the various access methods used by VLC. " \
"Common settings you may want to alter are HTTP proxy or " \ "Common settings you may want to alter are HTTP proxy or " \
"caching settings." ) "caching settings." )
#define ACCESS_FILTER_TITLE N_( "Access filter modules" ) #define ACCESS_FILTER_TITLE N_( "Access filters" )
#define ACCESS_FILTER_HELP N_( \ #define ACCESS_FILTER_HELP N_( \
"Settings related to the various access filter used by VLC.\n" ) "Access filters are special modules that allow advanced operations on " \
"the input side of VLC. You should not touch anything here unless you " \
"know what you are doing.\n" )
#define DEMUX_TITLE N_("Demuxers") #define DEMUX_TITLE N_("Demuxers")
#define DEMUX_HELP N_( "Demuxers are used to separate audio and video streams" ) #define DEMUX_HELP N_( "Demuxers are used to separate audio and video streams" )
......
...@@ -158,10 +158,10 @@ vlc_module_begin(); ...@@ -158,10 +158,10 @@ vlc_module_begin();
VLC_TRUE ); VLC_TRUE );
add_bool( "dshow-config", VLC_FALSE, NULL, CONFIG_TEXT, CONFIG_LONGTEXT, add_bool( "dshow-config", VLC_FALSE, NULL, CONFIG_TEXT, CONFIG_LONGTEXT,
VLC_FALSE ); VLC_TRUE );
add_bool( "dshow-tuner", VLC_FALSE, NULL, TUNER_TEXT, TUNER_LONGTEXT, add_bool( "dshow-tuner", VLC_FALSE, NULL, TUNER_TEXT, TUNER_LONGTEXT,
VLC_FALSE ); VLC_TRUE );
add_integer( "dshow-tuner-channel", 0, NULL, CHANNEL_TEXT, add_integer( "dshow-tuner-channel", 0, NULL, CHANNEL_TEXT,
CHANNEL_LONGTEXT, VLC_TRUE ); CHANNEL_LONGTEXT, VLC_TRUE );
......
...@@ -77,7 +77,7 @@ vlc_module_begin(); ...@@ -77,7 +77,7 @@ vlc_module_begin();
add_integer( "http-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL, add_integer( "http-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL,
CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
add_string( "http-user-agent", COPYRIGHT_MESSAGE , NULL, AGENT_TEXT, add_string( "http-user-agent", COPYRIGHT_MESSAGE , NULL, AGENT_TEXT,
AGENT_LONGTEXT, VLC_FALSE ); AGENT_LONGTEXT, VLC_TRUE );
add_bool( "http-reconnect", 0, NULL, RECONNECT_TEXT, add_bool( "http-reconnect", 0, NULL, RECONNECT_TEXT,
RECONNECT_LONGTEXT, VLC_TRUE ); RECONNECT_LONGTEXT, VLC_TRUE );
add_bool( "http-continuous", 0, NULL, CONTINUOUS_TEXT, add_bool( "http-continuous", 0, NULL, CONTINUOUS_TEXT,
......
...@@ -50,9 +50,10 @@ static void Close( vlc_object_t * ); ...@@ -50,9 +50,10 @@ static void Close( vlc_object_t * );
#define ALL_TEXT N_("Force selection of all streams") #define ALL_TEXT N_("Force selection of all streams")
#define BITRATE_TEXT N_("Select maximum bitrate stream") #define BITRATE_TEXT N_( "Maximum bitrate" )
#define BITRATE_LONGTEXT N_( \ #define BITRATE_LONGTEXT N_( \
"Always select the stream with the maximum bitrate." ) "If this is set, the stream with the maximum bitrate under that limit \
will be selected" )
vlc_module_begin(); vlc_module_begin();
set_shortname( _("MMS") ); set_shortname( _("MMS") );
......
...@@ -43,7 +43,7 @@ static void Close( vlc_object_t * ); ...@@ -43,7 +43,7 @@ static void Close( vlc_object_t * );
"value should be set in millisecond units." ) "value should be set in millisecond units." )
vlc_module_begin(); vlc_module_begin();
set_description( _("Standard filesystem file input") ); set_description( _("Real RTSP") );
set_shortname( _("Real RTSP") ); set_shortname( _("Real RTSP") );
set_category( CAT_INPUT ); set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACCESS ); set_subcategory( SUBCAT_INPUT_ACCESS );
......
...@@ -76,7 +76,7 @@ vlc_module_begin(); ...@@ -76,7 +76,7 @@ vlc_module_begin();
set_subcategory( SUBCAT_AUDIO_AFILTER ); set_subcategory( SUBCAT_AUDIO_AFILTER );
add_integer( "headphone-dim", 10, NULL, HEADPHONE_DIM_TEXT, add_integer( "headphone-dim", 10, NULL, HEADPHONE_DIM_TEXT,
HEADPHONE_DIM_LONGTEXT, VLC_FALSE ); HEADPHONE_DIM_LONGTEXT, VLC_TRUE );
add_bool( "headphone-compensate", 0, NULL, HEADPHONE_COMPENSATE_TEXT, add_bool( "headphone-compensate", 0, NULL, HEADPHONE_COMPENSATE_TEXT,
HEADPHONE_COMPENSATE_LONGTEXT, VLC_TRUE ); HEADPHONE_COMPENSATE_LONGTEXT, VLC_TRUE );
add_bool( "headphone-dolby", 0, NULL, HEADPHONE_DOLBY_TEXT, add_bool( "headphone-dolby", 0, NULL, HEADPHONE_DOLBY_TEXT,
......
...@@ -53,8 +53,7 @@ static block_t *Encode ( encoder_t *, aout_buffer_t * ); ...@@ -53,8 +53,7 @@ static block_t *Encode ( encoder_t *, aout_buffer_t * );
"instead of specifying a particular bitrate. " \ "instead of specifying a particular bitrate. " \
"This will produce a VBR stream." ) "This will produce a VBR stream." )
#define ENC_MODE_TEXT N_("Stereo mode") #define ENC_MODE_TEXT N_("Stereo mode")
#define ENC_MODE_LONGTEXT N_( \ #define ENC_MODE_LONGTEXT N_( "Select how stereo streams will be handled" )
"[0=stereo, 1=dual-mono, 2=joint-stereo]" )
#define ENC_VBR_TEXT N_("VBR mode") #define ENC_VBR_TEXT N_("VBR mode")
#define ENC_VBR_LONGTEXT N_( \ #define ENC_VBR_LONGTEXT N_( \
"By default the encoding is CBR." ) "By default the encoding is CBR." )
...@@ -62,6 +61,11 @@ static block_t *Encode ( encoder_t *, aout_buffer_t * ); ...@@ -62,6 +61,11 @@ static block_t *Encode ( encoder_t *, aout_buffer_t * );
#define ENC_PSY_LONGTEXT N_( \ #define ENC_PSY_LONGTEXT N_( \
"Integer from -1 (no model) to 4." ) "Integer from -1 (no model) to 4." )
static int pi_stereo_values[] = { 0, 1, 2 };
static char *ppsz_stereo_descriptions[] =
{ N_("Stereo"), N_("Dual mono"), N_("Joint stereo") };
vlc_module_begin(); vlc_module_begin();
set_shortname( "Twolame"); set_shortname( "Twolame");
set_description( _("Libtwolame audio encoder") ); set_description( _("Libtwolame audio encoder") );
...@@ -74,6 +78,7 @@ vlc_module_begin(); ...@@ -74,6 +78,7 @@ vlc_module_begin();
ENC_QUALITY_LONGTEXT, VLC_FALSE ); ENC_QUALITY_LONGTEXT, VLC_FALSE );
add_integer( ENC_CFG_PREFIX "mode", 0, NULL, ENC_MODE_TEXT, add_integer( ENC_CFG_PREFIX "mode", 0, NULL, ENC_MODE_TEXT,
ENC_MODE_LONGTEXT, VLC_FALSE ); ENC_MODE_LONGTEXT, VLC_FALSE );
change_integer_list( pi_stereo_values, ppsz_stereo_descriptions, 0 );
add_bool( ENC_CFG_PREFIX "vbr", 0, NULL, ENC_VBR_TEXT, add_bool( ENC_CFG_PREFIX "vbr", 0, NULL, ENC_VBR_TEXT,
ENC_VBR_LONGTEXT, VLC_FALSE ); ENC_VBR_LONGTEXT, VLC_FALSE );
add_integer( ENC_CFG_PREFIX "psy", 3, NULL, ENC_PSY_TEXT, add_integer( ENC_CFG_PREFIX "psy", 3, NULL, ENC_PSY_TEXT,
......
...@@ -125,7 +125,7 @@ static char *enc_analyse_list_text[] = ...@@ -125,7 +125,7 @@ static char *enc_analyse_list_text[] =
N_("fast"), N_("none") }; N_("fast"), N_("none") };
vlc_module_begin(); vlc_module_begin();
set_description( _("h264 video encoder using x264 library")); set_description( _("H264 encoder (using x264 library)"));
set_capability( "encoder", 200 ); set_capability( "encoder", 200 );
set_callbacks( Open, Close ); set_callbacks( Open, Close );
set_category( CAT_INPUT ); set_category( CAT_INPUT );
......
...@@ -42,7 +42,8 @@ ...@@ -42,7 +42,8 @@
#define INDEX_TEXT N_("Force index creation") #define INDEX_TEXT N_("Force index creation")
#define INDEX_LONGTEXT N_( \ #define INDEX_LONGTEXT N_( \
"Recreate a index for the AVI file so we can seek trough it more reliably." ) "Recreate a index for the AVI file. Use this if your AVI file is damaged "\
"or incomplete (not seekable)" )
static int Open ( vlc_object_t * ); static int Open ( vlc_object_t * );
static void Close( vlc_object_t * ); static void Close( vlc_object_t * );
...@@ -57,7 +58,7 @@ vlc_module_begin(); ...@@ -57,7 +58,7 @@ vlc_module_begin();
add_bool( "avi-interleaved", 0, NULL, add_bool( "avi-interleaved", 0, NULL,
INTERLEAVE_TEXT, INTERLEAVE_LONGTEXT, VLC_TRUE ); INTERLEAVE_TEXT, INTERLEAVE_LONGTEXT, VLC_TRUE );
add_bool( "avi-index", 0, NULL, add_bool( "avi-index", 0, NULL,
INDEX_TEXT, INDEX_LONGTEXT, VLC_TRUE ); INDEX_TEXT, INDEX_LONGTEXT, VLC_FALSE );
set_callbacks( Open, Close ); set_callbacks( Open, Close );
vlc_module_end(); vlc_module_end();
......
...@@ -69,9 +69,9 @@ static void Close( vlc_object_t * ); ...@@ -69,9 +69,9 @@ static void Close( vlc_object_t * );
"for communication. In this mode you cannot talk to normal RTSP servers." ) "for communication. In this mode you cannot talk to normal RTSP servers." )
vlc_module_begin(); vlc_module_begin();
set_description( _("live.com (RTSP/RTP/SDP) demuxer" ) ); set_description( _("RTP/RTSP/SDP demuxer (using Live.com)" ) );
set_capability( "demux2", 50 ); set_capability( "demux2", 50 );
set_shortname( "Live.com RTP/RTSP"); set_shortname( "RTP/RTSP");
set_callbacks( Open, Close ); set_callbacks( Open, Close );
add_shortcut( "live" ); add_shortcut( "live" );
set_category( CAT_INPUT ); set_category( CAT_INPUT );
......
...@@ -46,7 +46,7 @@ vlc_module_begin(); ...@@ -46,7 +46,7 @@ vlc_module_begin();
VLC_FALSE ); VLC_FALSE );
set_shortname( _("Playlist") ); set_shortname( _("Playlist") );
set_description( _("Old playlist open") ); set_description( _("Playlist") );
add_shortcut( "old-open" ); add_shortcut( "old-open" );
set_capability( "demux2", 10 ); set_capability( "demux2", 10 );
set_callbacks( E_(Import_Old), NULL ); set_callbacks( E_(Import_Old), NULL );
......
...@@ -65,8 +65,6 @@ static void BlendPalRV( filter_t *, picture_t *, picture_t *, picture_t *, ...@@ -65,8 +65,6 @@ static void BlendPalRV( filter_t *, picture_t *, picture_t *, picture_t *,
*****************************************************************************/ *****************************************************************************/
vlc_module_begin(); vlc_module_begin();
set_description( _("Video pictures blending") ); set_description( _("Video pictures blending") );
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_VFILTER );
set_capability( "video blending", 100 ); set_capability( "video blending", 100 );
set_callbacks( OpenFilter, CloseFilter ); set_callbacks( OpenFilter, CloseFilter );
vlc_module_end(); vlc_module_end();
......
...@@ -67,7 +67,7 @@ vlc_module_begin(); ...@@ -67,7 +67,7 @@ vlc_module_begin();
set_subcategory( SUBCAT_VIDEO_VFILTER ); set_subcategory( SUBCAT_VIDEO_VFILTER );
add_integer( "clone-count", 2, NULL, COUNT_TEXT, COUNT_LONGTEXT, VLC_FALSE ); add_integer( "clone-count", 2, NULL, COUNT_TEXT, COUNT_LONGTEXT, VLC_FALSE );
add_string ( "clone-vout-list", NULL, NULL, VOUTLIST_TEXT, VOUTLIST_LONGTEXT, VLC_FALSE ); add_string ( "clone-vout-list", NULL, NULL, VOUTLIST_TEXT, VOUTLIST_LONGTEXT, VLC_TRUE );
add_shortcut( "clone" ); add_shortcut( "clone" );
set_callbacks( Create, Destroy ); set_callbacks( Create, Destroy );
......
...@@ -100,7 +100,10 @@ static int FilterCallback ( vlc_object_t *, char const *, ...@@ -100,7 +100,10 @@ static int FilterCallback ( vlc_object_t *, char const *,
* Module descriptor * Module descriptor
*****************************************************************************/ *****************************************************************************/
#define MODE_TEXT N_("Deinterlace mode") #define MODE_TEXT N_("Deinterlace mode")
#define MODE_LONGTEXT N_("You can choose the default deinterlace mode") #define MODE_LONGTEXT N_("Default deinterlace method to use for local playback")
#define SOUT_MODE_TEXT N_("Deinterlace mode")
#define SOUT_MODE_LONGTEXT N_("Default deinterlace methode to use for streaming")
#define FILTER_CFG_PREFIX "sout-deinterlace-" #define FILTER_CFG_PREFIX "sout-deinterlace-"
...@@ -126,8 +129,8 @@ vlc_module_begin(); ...@@ -126,8 +129,8 @@ vlc_module_begin();
add_submodule(); add_submodule();
set_capability( "video filter2", 0 ); set_capability( "video filter2", 0 );
set_section( N_("Streaming"),NULL); set_section( N_("Streaming"),NULL);
add_string( FILTER_CFG_PREFIX "mode", "blend", NULL, MODE_TEXT, add_string( FILTER_CFG_PREFIX "mode", "blend", NULL, SOUT_MODE_TEXT,
MODE_LONGTEXT, VLC_FALSE ); SOUT_MODE_LONGTEXT, VLC_FALSE );
change_string_list( mode_list, mode_list_text, 0 ); change_string_list( mode_list, mode_list_text, 0 );
set_callbacks( OpenFilter, CloseFilter ); set_callbacks( OpenFilter, CloseFilter );
vlc_module_end(); vlc_module_end();
......
...@@ -95,11 +95,11 @@ vlc_module_begin(); ...@@ -95,11 +95,11 @@ vlc_module_begin();
set_callbacks( Create, Destroy ); set_callbacks( Create, Destroy );
add_file( "logo-file", NULL, NULL, FILE_TEXT, FILE_LONGTEXT, VLC_FALSE ); add_file( "logo-file", NULL, NULL, FILE_TEXT, FILE_LONGTEXT, VLC_FALSE );
add_integer( "logo-x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, VLC_FALSE ); add_integer( "logo-x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, VLC_TRUE );
add_integer( "logo-y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, VLC_FALSE ); add_integer( "logo-y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, VLC_TRUE );
add_integer_with_range( "logo-transparency", 255, 0, 255, NULL, add_integer_with_range( "logo-transparency", 255, 0, 255, NULL,
TRANS_TEXT, TRANS_LONGTEXT, VLC_FALSE ); TRANS_TEXT, TRANS_LONGTEXT, VLC_FALSE );
add_integer( "logo-position", 6, NULL, POS_TEXT, POS_LONGTEXT, VLC_TRUE ); add_integer( "logo-position", 6, NULL, POS_TEXT, POS_LONGTEXT, VLC_FALSE );
change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 ); change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
/* subpicture filter submodule */ /* subpicture filter submodule */
......
...@@ -115,19 +115,21 @@ vlc_module_begin(); ...@@ -115,19 +115,21 @@ vlc_module_begin();
set_callbacks( CreateFilter, DestroyFilter ); set_callbacks( CreateFilter, DestroyFilter );
set_category( CAT_VIDEO ); set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_SUBPIC ); set_subcategory( SUBCAT_VIDEO_SUBPIC );
add_string( "marq-marquee", "Marquee", NULL, MSG_TEXT, MSG_LONGTEXT, VLC_FALSE ); add_string( "marq-marquee", "VLC", NULL, MSG_TEXT, MSG_LONGTEXT,
VLC_FALSE );
set_section( N_("Position"), NULL ); set_section( N_("Position"), NULL );
add_integer( "marq-x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, VLC_FALSE ); add_integer( "marq-x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, VLC_TRUE );
add_integer( "marq-y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, VLC_FALSE ); add_integer( "marq-y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, VLC_TRUE );
add_integer( "marq-position", 5, NULL, POS_TEXT, POS_LONGTEXT, VLC_TRUE ); add_integer( "marq-position", 5, NULL, POS_TEXT, POS_LONGTEXT, VLC_FALSE );
set_section( N_("Font"), NULL ); set_section( N_("Font"), NULL );
/* 5 sets the default to top [1] left [4] */ /* 5 sets the default to top [1] left [4] */
change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 ); change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
add_integer_with_range( "marq-opacity", 255, 0, 255, NULL, add_integer_with_range( "marq-opacity", 255, 0, 255, NULL,
OPACITY_TEXT, OPACITY_LONGTEXT, VLC_FALSE ); OPACITY_TEXT, OPACITY_LONGTEXT, VLC_FALSE );
add_integer( "marq-color", 0xFFFFFF, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE ); add_integer( "marq-color", 0xFFFFFF, NULL, COLOR_TEXT, COLOR_LONGTEXT,
VLC_FALSE );
change_integer_list( pi_color_values, ppsz_color_descriptions, 0 ); change_integer_list( pi_color_values, ppsz_color_descriptions, 0 );
add_integer( "marq-size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT, VLC_FALSE ); add_integer( "marq-size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT, VLC_FALSE );
......
...@@ -116,8 +116,10 @@ vlc_module_begin(); ...@@ -116,8 +116,10 @@ vlc_module_begin();
set_description( N_("On Screen Display menu subfilter") ); set_description( N_("On Screen Display menu subfilter") );
set_shortname( N_("OSD menu") ); set_shortname( N_("OSD menu") );
add_shortcut( "osdmenu" ); add_shortcut( "osdmenu" );
/*
set_category( CAT_VIDEO ); set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_SUBPIC ); set_subcategory( SUBCAT_VIDEO_SUBPIC );
*/
set_callbacks( CreateFilter, DestroyFilter ); set_callbacks( CreateFilter, DestroyFilter );
vlc_module_end(); vlc_module_end();
......
...@@ -156,16 +156,17 @@ vlc_module_begin(); ...@@ -156,16 +156,17 @@ vlc_module_begin();
add_string( "rss-urls", "rss", NULL, MSG_TEXT, MSG_LONGTEXT, VLC_FALSE ); add_string( "rss-urls", "rss", NULL, MSG_TEXT, MSG_LONGTEXT, VLC_FALSE );
set_section( N_("Position"), NULL ); set_section( N_("Position"), NULL );
add_integer( "rss-x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, VLC_FALSE ); add_integer( "rss-x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, VLC_TRUE );
add_integer( "rss-y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, VLC_FALSE ); add_integer( "rss-y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, VLC_TRUE );
add_integer( "rss-position", 5, NULL, POS_TEXT, POS_LONGTEXT, VLC_TRUE ); add_integer( "rss-position", 5, NULL, POS_TEXT, POS_LONGTEXT, VLC_FALSE );
change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
set_section( N_("Font"), NULL ); set_section( N_("Font"), NULL );
/* 5 sets the default to top [1] left [4] */ /* 5 sets the default to top [1] left [4] */
change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
add_integer_with_range( "rss-opacity", 255, 0, 255, NULL, add_integer_with_range( "rss-opacity", 255, 0, 255, NULL,
OPACITY_TEXT, OPACITY_LONGTEXT, VLC_FALSE ); OPACITY_TEXT, OPACITY_LONGTEXT, VLC_FALSE );
add_integer( "rss-color", 0xFFFFFF, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE ); add_integer( "rss-color", 0xFFFFFF, NULL, COLOR_TEXT, COLOR_LONGTEXT,
VLC_FALSE );
change_integer_list( pi_color_values, ppsz_color_descriptions, 0 ); change_integer_list( pi_color_values, ppsz_color_descriptions, 0 );
add_integer( "rss-size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT, VLC_FALSE ); add_integer( "rss-size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT, VLC_FALSE );
...@@ -174,9 +175,9 @@ vlc_module_begin(); ...@@ -174,9 +175,9 @@ vlc_module_begin();
VLC_FALSE ); VLC_FALSE );
add_integer( "rss-length", 60, NULL, LENGTH_TEXT, LENGTH_LONGTEXT, add_integer( "rss-length", 60, NULL, LENGTH_TEXT, LENGTH_LONGTEXT,
VLC_FALSE ); VLC_FALSE );
add_integer( "rss-ttl", 900, NULL, TTL_TEXT, TTL_LONGTEXT, VLC_FALSE ); add_integer( "rss-ttl", 1800, NULL, TTL_TEXT, TTL_LONGTEXT, VLC_FALSE );
set_description( _("RSS feed display sub filter") ); set_description( _("RSS feed display") );
add_shortcut( "rss" ); add_shortcut( "rss" );
vlc_module_end(); vlc_module_end();
......
...@@ -51,8 +51,6 @@ static picture_t *Filter( filter_t *, picture_t * ); ...@@ -51,8 +51,6 @@ static picture_t *Filter( filter_t *, picture_t * );
vlc_module_begin(); vlc_module_begin();
set_description( _("RV32 conversion filter") ); set_description( _("RV32 conversion filter") );
set_capability( "video filter2", 1 ); set_capability( "video filter2", 1 );
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_VFILTER );
set_callbacks( OpenFilter, CloseFilter ); set_callbacks( OpenFilter, CloseFilter );
vlc_module_end(); vlc_module_end();
......
...@@ -105,15 +105,17 @@ vlc_module_begin(); ...@@ -105,15 +105,17 @@ vlc_module_begin();
set_category( CAT_VIDEO ); set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_SUBPIC ); set_subcategory( SUBCAT_VIDEO_SUBPIC );
set_callbacks( CreateFilter, DestroyFilter ); set_callbacks( CreateFilter, DestroyFilter );
add_string( "time-format", "%Y-%m-%d %H:%M:%S", NULL, MSG_TEXT, MSG_LONGTEXT, VLC_FALSE ); add_string( "time-format", "%Y-%m-%d %H:%M:%S", NULL, MSG_TEXT,
add_integer( "time-x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, VLC_FALSE ); MSG_LONGTEXT, VLC_TRUE );
add_integer( "time-y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, VLC_FALSE ); add_integer( "time-x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, VLC_TRUE );
add_integer( "time-position", 9, NULL, POS_TEXT, POS_LONGTEXT, VLC_TRUE ); add_integer( "time-y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, VLC_TRUE );
add_integer( "time-position", 9, NULL, POS_TEXT, POS_LONGTEXT, VLC_FALSE );
/* 9 sets the default to bottom-left, minimizing jitter */ /* 9 sets the default to bottom-left, minimizing jitter */
change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 ); change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
add_integer_with_range( "time-opacity", 255, 0, 255, NULL, add_integer_with_range( "time-opacity", 255, 0, 255, NULL,
OPACITY_TEXT, OPACITY_LONGTEXT, VLC_FALSE ); OPACITY_TEXT, OPACITY_LONGTEXT, VLC_FALSE );
add_integer( "time-color", 0xFFFFFF, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE ); add_integer( "time-color", 0xFFFFFF, NULL, COLOR_TEXT, COLOR_LONGTEXT,
VLC_FALSE );
change_integer_list( pi_color_values, ppsz_color_descriptions, 0 ); change_integer_list( pi_color_values, ppsz_color_descriptions, 0 );
add_integer( "time-size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT, VLC_FALSE ); add_integer( "time-size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT, VLC_FALSE );
set_description( _("Time display sub filter") ); set_description( _("Time display sub filter") );
......
...@@ -74,7 +74,8 @@ vlc_module_begin(); ...@@ -74,7 +74,8 @@ vlc_module_begin();
add_integer( "wall-cols", 3, NULL, COLS_TEXT, COLS_LONGTEXT, VLC_FALSE ); add_integer( "wall-cols", 3, NULL, COLS_TEXT, COLS_LONGTEXT, VLC_FALSE );
add_integer( "wall-rows", 3, NULL, ROWS_TEXT, ROWS_LONGTEXT, VLC_FALSE ); add_integer( "wall-rows", 3, NULL, ROWS_TEXT, ROWS_LONGTEXT, VLC_FALSE );
add_string( "wall-active", NULL, NULL, ACTIVE_TEXT, ACTIVE_LONGTEXT, VLC_FALSE ); add_string( "wall-active", NULL, NULL, ACTIVE_TEXT, ACTIVE_LONGTEXT,
VLC_TRUE );
add_string( "wall-element-aspect", "4:3", NULL, ASPECT_TEXT, ASPECT_LONGTEXT, VLC_FALSE ); add_string( "wall-element-aspect", "4:3", NULL, ASPECT_TEXT, ASPECT_LONGTEXT, VLC_FALSE );
add_shortcut( "wall" ); add_shortcut( "wall" );
......
...@@ -74,9 +74,9 @@ static char *ppsz_snap_formats[] = ...@@ -74,9 +74,9 @@ static char *ppsz_snap_formats[] =
#define QUIET_LONGTEXT N_( \ #define QUIET_LONGTEXT N_( \
"This option turns off all warning and information messages.") "This option turns off all warning and information messages.")
#define OPEN_TEXT N_("Open MRL") #define OPEN_TEXT N_("Default stream")
#define OPEN_LONGTEXT N_( \ #define OPEN_LONGTEXT N_( \
"This option allows you to open a default MRL on start-up.") "This option allows you to always open a default stream on start-up." )
#define LANGUAGE_TEXT N_("Language") #define LANGUAGE_TEXT N_("Language")
#define LANGUAGE_LONGTEXT N_( "This option allows you to set the language " \ #define LANGUAGE_LONGTEXT N_( "This option allows you to set the language " \
...@@ -115,7 +115,7 @@ static char *ppsz_snap_formats[] = ...@@ -115,7 +115,7 @@ static char *ppsz_snap_formats[] =
#define MONO_TEXT N_("Force mono audio") #define MONO_TEXT N_("Force mono audio")
#define MONO_LONGTEXT N_("This will force a mono audio output.") #define MONO_LONGTEXT N_("This will force a mono audio output.")
#define VOLUME_TEXT N_("Audio output volume") #define VOLUME_TEXT N_("Default audio volume")
#define VOLUME_LONGTEXT N_( \ #define VOLUME_LONGTEXT N_( \
"You can set the default audio output volume here, in a range from 0 to " \ "You can set the default audio output volume here, in a range from 0 to " \
"1024.") "1024.")
...@@ -296,7 +296,8 @@ static char *ppsz_align_descriptions[] = ...@@ -296,7 +296,8 @@ static char *ppsz_align_descriptions[] =
#define SKIP_FRAMES_TEXT N_("Skip frames") #define SKIP_FRAMES_TEXT N_("Skip frames")
#define SKIP_FRAMES_LONGTEXT N_( \ #define SKIP_FRAMES_LONGTEXT N_( \
"Disable this option to disable frame drops on MPEG-2 streams.") "This option enables framedropping on MPEG2 stream. Framedropping " \
"occurs when your computer is not powerful enough" )
#define QUIET_SYNCHRO_TEXT N_("Quiet synchro") #define QUIET_SYNCHRO_TEXT N_("Quiet synchro")
#define QUIET_SYNCHRO_LONGTEXT N_( \ #define QUIET_SYNCHRO_LONGTEXT N_( \
...@@ -336,35 +337,35 @@ static char *ppsz_clock_descriptions[] = ...@@ -336,35 +337,35 @@ static char *ppsz_clock_descriptions[] =
"Indicate here the Time To Live of the multicast packets sent by " \ "Indicate here the Time To Live of the multicast packets sent by " \
"the stream output.") "the stream output.")
#define INPUT_PROGRAM_TEXT N_("Choose program (SID)") #define INPUT_PROGRAM_TEXT N_("Program to select")
#define INPUT_PROGRAM_LONGTEXT N_( \ #define INPUT_PROGRAM_LONGTEXT N_( \
"Choose the program to select by giving its Service ID.\n" \ "Choose the program to select by giving its Service ID.\n" \
"Only use this option if you want to read a multi-program stream " \ "Only use this option if you want to read a multi-program stream " \
"(like DVB streams for example)." ) "(like DVB streams for example)." )
#define INPUT_PROGRAMS_TEXT N_("Choose programs") #define INPUT_PROGRAMS_TEXT N_("Programs to select")
#define INPUT_PROGRAMS_LONGTEXT N_( \ #define INPUT_PROGRAMS_LONGTEXT N_( \
"Choose the programs to select by giving a comma-separated list of " \ "Choose the programs to select by giving a comma-separated list of " \
"SIDs.\n" \ "SIDs.\n" \
"Only use this option if you want to read a multi-program stream " \ "Only use this option if you want to read a multi-program stream " \
"(like DVB streams for example)." ) "(like DVB streams for example)." )
#define INPUT_AUDIOTRACK_TEXT N_("Choose audio track") #define INPUT_AUDIOTRACK_TEXT N_("Audio track")
#define INPUT_AUDIOTRACK_LONGTEXT N_( \ #define INPUT_AUDIOTRACK_LONGTEXT N_( \
"Give the stream number of the audio track you want to use" \ "Give the stream number of the audio track you want to use" \
"(from 0 to n).") "(from 0 to n).")
#define INPUT_SUBTRACK_TEXT N_("Choose subtitles track") #define INPUT_SUBTRACK_TEXT N_("Subtitles track")
#define INPUT_SUBTRACK_LONGTEXT N_( \ #define INPUT_SUBTRACK_LONGTEXT N_( \
"Give the stream number of the subtitle track you want to use " \ "Give the stream number of the subtitle track you want to use " \
"(from 0 to n).") "(from 0 to n).")
#define INPUT_AUDIOTRACK_LANG_TEXT N_("Choose audio language") #define INPUT_AUDIOTRACK_LANG_TEXT N_("Audio language")
#define INPUT_AUDIOTRACK_LANG_LONGTEXT N_( \ #define INPUT_AUDIOTRACK_LANG_LONGTEXT N_( \
"Give the language of the audio track you want to use " \ "Give the language of the audio track you want to use " \
"(comma separted, two or tree letter country code).") "(comma separted, two or tree letter country code).")
#define INPUT_SUBTRACK_LANG_TEXT N_("Choose subtitle language") #define INPUT_SUBTRACK_LANG_TEXT N_("Subtitle language")
#define INPUT_SUBTRACK_LANG_LONGTEXT N_( \ #define INPUT_SUBTRACK_LANG_LONGTEXT N_( \
"Give the language of the subtitle track you want to use " \ "Give the language of the subtitle track you want to use " \
"(comma separted, two or tree letter country code).") "(comma separted, two or tree letter country code).")
...@@ -381,12 +382,12 @@ static char *ppsz_clock_descriptions[] = ...@@ -381,12 +382,12 @@ static char *ppsz_clock_descriptions[] =
#define INPUT_LIST_TEXT N_("Input list") #define INPUT_LIST_TEXT N_("Input list")
#define INPUT_LIST_LONGTEXT N_("Allows you to specify a comma-separated list " \ #define INPUT_LIST_LONGTEXT N_("Allows you to specify a comma-separated list " \
"of inputs that will be concatenated.") "of inputs that will be concatenated after the normal one.")
#define INPUT_SLAVE_TEXT N_("Input slave (experimental)") #define INPUT_SLAVE_TEXT N_("Input slave (experimental)")
#define INPUT_SLAVE_LONGTEXT N_("Allows you to play from several files at " \ #define INPUT_SLAVE_LONGTEXT N_("Allows you to play from several streams at " \
"the same time. This feature is experimental, not all formats " \ "the same time. This feature is experimental, not all formats " \
"are supported.") "are supported.")
#define BOOKMARKS_TEXT N_("Bookmarks list for a stream") #define BOOKMARKS_TEXT N_("Bookmarks list for a stream")
#define BOOKMARKS_LONGTEXT N_("You can specify a list of bookmarks for a stream in " \ #define BOOKMARKS_LONGTEXT N_("You can specify a list of bookmarks for a stream in " \
...@@ -680,7 +681,9 @@ static char *ppsz_clock_descriptions[] = ...@@ -680,7 +681,9 @@ static char *ppsz_clock_descriptions[] =
#define ACCESS_TEXT N_("Access module") #define ACCESS_TEXT N_("Access module")
#define ACCESS_LONGTEXT N_( \ #define ACCESS_LONGTEXT N_( \
"This is a legacy entry to let you configure access modules.") "This allows you to force an access module. You can use it if " \
"the correct access is not automatically detected. You should not "\
"set this as a global option unless you really know what you are doing." )
#define ACCESS_FILTER_TEXT N_("Access filter module") #define ACCESS_FILTER_TEXT N_("Access filter module")
#define ACCESS_FILTER_LONGTEXT N_( \ #define ACCESS_FILTER_LONGTEXT N_( \
...@@ -958,9 +961,9 @@ vlc_module_begin(); ...@@ -958,9 +961,9 @@ vlc_module_begin();
add_bool( "hq-resampling", 1, NULL, AOUT_RESAMP_TEXT, add_bool( "hq-resampling", 1, NULL, AOUT_RESAMP_TEXT,
AOUT_RESAMP_LONGTEXT, VLC_TRUE ); AOUT_RESAMP_LONGTEXT, VLC_TRUE );
#endif #endif
add_bool( "spdif", 0, NULL, SPDIF_TEXT, SPDIF_LONGTEXT, VLC_FALSE ); add_bool( "spdif", 0, NULL, SPDIF_TEXT, SPDIF_LONGTEXT, VLC_TRUE );
add_integer( "force-dolby-surround", 0, NULL, FORCE_DOLBY_TEXT, add_integer( "force-dolby-surround", 0, NULL, FORCE_DOLBY_TEXT,
FORCE_DOLBY_LONGTEXT, VLC_FALSE ); FORCE_DOLBY_LONGTEXT, VLC_TRUE );
change_integer_list( pi_force_dolby_values, ppsz_force_dolby_descriptions, 0 ); change_integer_list( pi_force_dolby_values, ppsz_force_dolby_descriptions, 0 );
add_integer( "audio-desync", 0, NULL, DESYNC_TEXT, add_integer( "audio-desync", 0, NULL, DESYNC_TEXT,
DESYNC_LONGTEXT, VLC_TRUE ); DESYNC_LONGTEXT, VLC_TRUE );
...@@ -987,7 +990,7 @@ vlc_module_begin(); ...@@ -987,7 +990,7 @@ vlc_module_begin();
FULLSCREEN_LONGTEXT, VLC_FALSE ); FULLSCREEN_LONGTEXT, VLC_FALSE );
change_short('f'); change_short('f');
add_bool( "skip-frames", 1, NULL, SKIP_FRAMES_TEXT, add_bool( "skip-frames", 1, NULL, SKIP_FRAMES_TEXT,
SKIP_FRAMES_LONGTEXT, VLC_FALSE ); SKIP_FRAMES_LONGTEXT, VLC_TRUE );
add_bool( "quiet-synchro", 0, NULL, QUIET_SYNCHRO_TEXT, add_bool( "quiet-synchro", 0, NULL, QUIET_SYNCHRO_TEXT,
QUIET_SYNCHRO_LONGTEXT, VLC_TRUE ); QUIET_SYNCHRO_LONGTEXT, VLC_TRUE );
#ifndef SYS_DARWIN #ifndef SYS_DARWIN
...@@ -1087,12 +1090,12 @@ vlc_module_begin(); ...@@ -1087,12 +1090,12 @@ vlc_module_begin();
add_integer( "program", 0, NULL, add_integer( "program", 0, NULL,
INPUT_PROGRAM_TEXT, INPUT_PROGRAM_LONGTEXT, VLC_TRUE ); INPUT_PROGRAM_TEXT, INPUT_PROGRAM_LONGTEXT, VLC_TRUE );
add_string( "programs", "", NULL, add_string( "programs", "", NULL,
INPUT_PROGRAMS_TEXT, INPUT_PROGRAMS_LONGTEXT, VLC_FALSE ); INPUT_PROGRAMS_TEXT, INPUT_PROGRAMS_LONGTEXT, VLC_TRUE );
add_integer( "audio-track", -1, NULL, add_integer( "audio-track", -1, NULL,
INPUT_AUDIOTRACK_TEXT, INPUT_AUDIOTRACK_LONGTEXT, VLC_FALSE ); INPUT_AUDIOTRACK_TEXT, INPUT_AUDIOTRACK_LONGTEXT, VLC_TRUE );
add_deprecated( "audio-channel", VLC_FALSE ); /*deprecated since 0.8.2 */ add_deprecated( "audio-channel", VLC_FALSE ); /*deprecated since 0.8.2 */
add_integer( "sub-track", -1, NULL, add_integer( "sub-track", -1, NULL,
INPUT_SUBTRACK_TEXT, INPUT_SUBTRACK_LONGTEXT, VLC_FALSE ); INPUT_SUBTRACK_TEXT, INPUT_SUBTRACK_LONGTEXT, VLC_TRUE );
add_deprecated("spu-channel",VLC_FALSE); /*deprecated since 0.8.2*/ add_deprecated("spu-channel",VLC_FALSE); /*deprecated since 0.8.2*/
add_string( "audio-language", "", NULL, add_string( "audio-language", "", NULL,
INPUT_AUDIOTRACK_LANG_TEXT, INPUT_AUDIOTRACK_LANG_LONGTEXT, INPUT_AUDIOTRACK_LANG_TEXT, INPUT_AUDIOTRACK_LANG_LONGTEXT,
...@@ -1101,10 +1104,9 @@ vlc_module_begin(); ...@@ -1101,10 +1104,9 @@ vlc_module_begin();
INPUT_SUBTRACK_LANG_TEXT, INPUT_SUBTRACK_LANG_LONGTEXT, INPUT_SUBTRACK_LANG_TEXT, INPUT_SUBTRACK_LANG_LONGTEXT,
VLC_FALSE ); VLC_FALSE );
set_section( N_( "Playback control" ) , NULL); set_section( N_( "Playback control" ) , NULL);
add_integer( "input-repeat", 0, NULL, add_integer( "input-repeat", 0, NULL,
INPUT_REPEAT_TEXT, INPUT_REPEAT_LONGTEXT, VLC_TRUE ); INPUT_REPEAT_TEXT, INPUT_REPEAT_LONGTEXT, VLC_FALSE );
add_integer( "start-time", 0, NULL, add_integer( "start-time", 0, NULL,
START_TIME_TEXT, START_TIME_LONGTEXT, VLC_TRUE ); START_TIME_TEXT, START_TIME_LONGTEXT, VLC_TRUE );
add_integer( "stop-time", 0, NULL, add_integer( "stop-time", 0, NULL,
......
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