mirror of https://code.videolan.org/videolan/vlc
Merge branch 'spu_ranges' into 'master'
plugins/spu: add some missing option ranges See merge request videolan/vlc!1234
This commit is contained in:
commit
da159517bf
|
@ -30,6 +30,7 @@
|
|||
#endif
|
||||
#include <string.h>
|
||||
#include <math.h>
|
||||
#include <limits.h>
|
||||
|
||||
#include "common.h"
|
||||
|
||||
|
@ -72,7 +73,9 @@ vlc_module_begin ()
|
|||
add_integer(CFG_PREFIX "position", -1, POS_TEXT, POS_LONGTEXT)
|
||||
change_integer_list(pi_pos_values, ppsz_pos_descriptions)
|
||||
add_integer(CFG_PREFIX "barWidth", 10, BARWIDTH_TEXT, BARWIDTH_LONGTEXT)
|
||||
change_integer_range(0, INT_MAX)
|
||||
add_integer(CFG_PREFIX "barHeight", 400, BARHEIGHT_TEXT, BARHEIGHT_LONGTEXT)
|
||||
change_integer_range(0, INT_MAX)
|
||||
|
||||
/* video output filter submodule */
|
||||
add_submodule ()
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
# include "config.h"
|
||||
#endif
|
||||
#include <assert.h>
|
||||
#include <limits.h>
|
||||
|
||||
#include "common.h"
|
||||
|
||||
|
@ -51,8 +52,8 @@
|
|||
#define REPEAT_TEXT N_("Animation loops")
|
||||
#define REPEAT_LONGTEXT N_("Number of loops for the logo animation. " \
|
||||
"-1 = continuous, 0 = disabled")
|
||||
#define DELAY_TEXT N_("Display time in ms")
|
||||
#define DELAY_LONGTEXT N_("Individual image display time of 0 - 60000 ms.")
|
||||
#define DELAY_TEXT N_("Display time (in ms)")
|
||||
#define DELAY_LONGTEXT N_("Individual image display time in milliseconds.")
|
||||
|
||||
#undef POSX_LONGTEXT
|
||||
#undef POSY_LONGTEXT
|
||||
|
@ -82,7 +83,9 @@ vlc_module_begin ()
|
|||
add_integer( CFG_PREFIX "y", -1, POSY_TEXT, POSY_LONGTEXT )
|
||||
/* default to 1000 ms per image, continuously cycle through them */
|
||||
add_integer( CFG_PREFIX "delay", 1000, DELAY_TEXT, DELAY_LONGTEXT )
|
||||
change_integer_range( 0, 60000 )
|
||||
add_integer( CFG_PREFIX "repeat", -1, REPEAT_TEXT, REPEAT_LONGTEXT )
|
||||
change_integer_range( -1, INT_MAX )
|
||||
add_integer_with_range( CFG_PREFIX "opacity", 255, 0, 255,
|
||||
OPACITY_TEXT, OPACITY_LONGTEXT )
|
||||
add_integer( CFG_PREFIX "position", -1, POS_TEXT, POS_LONGTEXT )
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
#endif
|
||||
|
||||
#include <time.h>
|
||||
#include <limits.h>
|
||||
|
||||
#include "common.h"
|
||||
|
||||
|
@ -196,8 +197,11 @@ vlc_module_begin ()
|
|||
|
||||
set_section( N_("Misc"), NULL )
|
||||
add_integer( CFG_PREFIX "speed", 100000, SPEED_TEXT, SPEED_LONGTEXT )
|
||||
change_integer_range( 0, INT_MAX )
|
||||
add_integer( CFG_PREFIX "length", 60, LENGTH_TEXT, LENGTH_LONGTEXT )
|
||||
change_integer_range( 0, INT_MAX )
|
||||
add_integer( CFG_PREFIX "ttl", 1800, TTL_TEXT, TTL_LONGTEXT )
|
||||
change_integer_range( 0, INT_MAX )
|
||||
add_bool( CFG_PREFIX "images", true, IMAGE_TEXT, IMAGE_LONGTEXT )
|
||||
add_integer( CFG_PREFIX "title", default_title, TITLE_TEXT, TITLE_LONGTEXT )
|
||||
change_integer_list( pi_title_modes, ppsz_title_modes )
|
||||
|
@ -259,7 +263,7 @@ static int CreateFilter( filter_t *p_filter )
|
|||
p_sys->i_length = var_CreateGetInteger( p_filter, CFG_PREFIX "length" );
|
||||
p_sys->b_images = var_CreateGetBool( p_filter, CFG_PREFIX "images" );
|
||||
|
||||
i_ttl = __MAX( 0, var_CreateGetInteger( p_filter, CFG_PREFIX "ttl" ) );
|
||||
i_ttl = var_CreateGetInteger( p_filter, CFG_PREFIX "ttl" );
|
||||
|
||||
p_sys->psz_marquee = malloc( p_sys->i_length + 1 );
|
||||
if( p_sys->psz_marquee == NULL )
|
||||
|
|
Loading…
Reference in New Issue