Commit 5fe479dd authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* Fix some configuration options declerations and strings

parent 9aebdb61
...@@ -136,19 +136,19 @@ ...@@ -136,19 +136,19 @@
#define SOUT_MUX_TITLE N_( "Muxers" ) #define SOUT_MUX_TITLE N_( "Muxers" )
#define SOUT_MUX_HELP N_( "Muxers are the encapsulation formats that are used to " \ #define SOUT_MUX_HELP N_( "Muxers are the encapsulation formats that are used to " \
"put all the elementary streams (video, audio, ...) " \ "put all the elementary streams (video, audio, ...) " \
"together. This setting allows you to always force a muxer." \ "together. This setting allows you to always force a muxer. " \
"You should probably not do that.\n" \ "You should probably not do that.\n" \
"You can also set default parameters for each muxer." ) "You can also set default parameters for each muxer." )
#define SOUT_ACO_TITLE N_( "Access output" ) #define SOUT_ACO_TITLE N_( "Access output" )
#define SOUT_ACO_HELP N_( "Access output are the ways the muxed streams are sent." \ #define SOUT_ACO_HELP N_( "Access output are the ways the muxed streams are sent. " \
"This setting allows you to always force an access output." \ "This setting allows you to always force an access output. " \
"You should probably not do that.\n" \ "You should probably not do that.\n" \
"You can also set default parameters for each access output.") "You can also set default parameters for each access output.")
#define SOUT_PACKET_TITLE N_( "Packetizers" ) #define SOUT_PACKET_TITLE N_( "Packetizers" )
#define SOUT_PACKET_HELP N_( "Packetizers are used to \"preprocess\" the elementary "\ #define SOUT_PACKET_HELP N_( "Packetizers are used to \"preprocess\" the elementary "\
"streams before muxing." \ "streams before muxing. " \
"This setting allows you to always force a packetizer." \ "This setting allows you to always force a packetizer. " \
"You should probably not do that.\n" \ "You should probably not do that.\n" \
"You can also set default parameters for each packetizer." ) "You can also set default parameters for each packetizer." )
......
...@@ -93,7 +93,7 @@ vlc_module_begin(); ...@@ -93,7 +93,7 @@ vlc_module_begin();
RECURSIVE_LONGTEXT, VLC_FALSE ); RECURSIVE_LONGTEXT, VLC_FALSE );
change_string_list( psz_recursive_list, psz_recursive_list_text, 0 ); change_string_list( psz_recursive_list, psz_recursive_list_text, 0 );
#ifdef HAVE_STRSEP #ifdef HAVE_STRSEP
add_string( "ignore-filetypes", "m3u,nfo,jpg,gif,sfv,txt,sub,idx,srt,cue", add_string( "ignore-filetypes", "m3u,db,nfo,jpg,gif,sfv,txt,sub,idx,srt,cue",
NULL, IGNORE_TEXT, IGNORE_LONGTEXT, VLC_FALSE ); NULL, IGNORE_TEXT, IGNORE_LONGTEXT, VLC_FALSE );
#endif #endif
set_callbacks( Open, Close ); set_callbacks( Open, Close );
......
...@@ -63,10 +63,10 @@ vlc_module_begin(); ...@@ -63,10 +63,10 @@ vlc_module_begin();
set_callbacks( OpenDecoder, CloseDecoder ); set_callbacks( OpenDecoder, CloseDecoder );
add_shortcut( "fake" ); add_shortcut( "fake" );
add_string( "fake-file", "", NULL, FILE_TEXT, add_file( "fake-file", "", NULL, FILE_TEXT,
FILE_LONGTEXT, VLC_TRUE ); FILE_LONGTEXT, VLC_FALSE );
add_string( "fake-aspect-ratio", "4:3", NULL, add_string( "fake-aspect-ratio", "4:3", NULL,
ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, VLC_FALSE ); ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, VLC_TRUE );
vlc_module_end(); vlc_module_end();
/***************************************************************************** /*****************************************************************************
......
...@@ -63,8 +63,7 @@ ...@@ -63,8 +63,7 @@
"Allows you to deinterlace the video before encoding." ) "Allows you to deinterlace the video before encoding." )
#define DEINTERLACE_MODULE_TEXT N_("Deinterlace module") #define DEINTERLACE_MODULE_TEXT N_("Deinterlace module")
#define DEINTERLACE_MODULE_LONGTEXT N_( \ #define DEINTERLACE_MODULE_LONGTEXT N_( \
"Specifies the deinterlace module to use (ffmpeg-deinterlace or " \ "Specifies the deinterlace module to use." )
"deinterlace)." )
#define WIDTH_TEXT N_("Video width") #define WIDTH_TEXT N_("Video width")
#define WIDTH_LONGTEXT N_( \ #define WIDTH_LONGTEXT N_( \
"Allows you to specify the output video width." ) "Allows you to specify the output video width." )
...@@ -141,6 +140,11 @@ ...@@ -141,6 +140,11 @@
#define HURRYUP_LONGTEXT N_( "Allows you to specify if the transcoder " \ #define HURRYUP_LONGTEXT N_( "Allows you to specify if the transcoder " \
"should drop frames if your CPU can't keep up with the encoding rate." ) "should drop frames if your CPU can't keep up with the encoding rate." )
static char *ppsz_deinterlace_type[] =
{
"deinterlace", "ffmpeg-deinterlace"
};
static int Open ( vlc_object_t * ); static int Open ( vlc_object_t * );
static void Close( vlc_object_t * ); static void Close( vlc_object_t * );
...@@ -172,6 +176,7 @@ vlc_module_begin(); ...@@ -172,6 +176,7 @@ vlc_module_begin();
add_string( SOUT_CFG_PREFIX "deinterlace-module", "deinterlace", NULL, add_string( SOUT_CFG_PREFIX "deinterlace-module", "deinterlace", NULL,
DEINTERLACE_MODULE_TEXT, DEINTERLACE_MODULE_LONGTEXT, DEINTERLACE_MODULE_TEXT, DEINTERLACE_MODULE_LONGTEXT,
VLC_FALSE ); VLC_FALSE );
change_string_list( ppsz_deinterlace_type, 0, 0 );
add_integer( SOUT_CFG_PREFIX "width", 0, NULL, WIDTH_TEXT, add_integer( SOUT_CFG_PREFIX "width", 0, NULL, WIDTH_TEXT,
WIDTH_LONGTEXT, VLC_TRUE ); WIDTH_LONGTEXT, VLC_TRUE );
add_integer( SOUT_CFG_PREFIX "height", 0, NULL, HEIGHT_TEXT, add_integer( SOUT_CFG_PREFIX "height", 0, NULL, HEIGHT_TEXT,
......
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