#include <vlc_common.h>
#include <vlc_plugin.h>
-#include <vlc_sout.h>
-#include <vlc_vout.h>
#include "vlc_filter.h"
#include "filter_picture.h"
set_category( CAT_VIDEO )
set_subcategory( SUBCAT_VIDEO_VFILTER )
- add_string( FILTER_PREFIX "ball-color", "ball-color", NULL,
+ add_string( FILTER_PREFIX "color", "ball-color", NULL,
BALL_COLOR_TEXT, BALL_COLOR_LONGTEXT, false )
change_string_list( mode_list, mode_list_text, 0 )
- add_integer_with_range( FILTER_PREFIX "ball-speed", 4, 1, 15, NULL,
+ add_integer_with_range( FILTER_PREFIX "speed", 4, 1, 15, NULL,
BALL_SPEED_TEXT, BALL_SPEED_LONGTEXT, false )
- add_integer_with_range( FILTER_PREFIX "ball-size", 10, 5, 30, NULL,
+ add_integer_with_range( FILTER_PREFIX "size", 10, 5, 30, NULL,
BALL_SIZE_TEXT, BALL_SIZE_LONGTEXT, false )
add_integer_with_range( FILTER_PREFIX "gradient-threshold", 40, 1, 200, NULL,
GRAD_THRESH_TEXT, GRAD_THRESH_LONGTEXT, false )
- add_bool( FILTER_PREFIX "edge-visible", 1, NULL,
+ add_bool( FILTER_PREFIX "edge-visible", true, NULL,
EDGE_VISIBLE_TEXT, EDGE_VISIBLE_LONGTEXT, true )
add_shortcut( "ball" )
COLORS_RGB
break;
default:
- msg_Err( p_filter, "Unsupported input chroma (%4s)",
+ msg_Err( p_filter, "Unsupported input chroma (%4.4s)",
(char*)&(p_filter->fmt_in.video.i_chroma) );
return VLC_EGENERIC;
}
if( !(psz_method =
var_CreateGetNonEmptyStringCommand( p_filter,
- FILTER_PREFIX "ball-color" ) ) )
+ FILTER_PREFIX "color" ) ) )
{
msg_Err( p_filter, "configuration variable "
- FILTER_PREFIX "ball-color empty" );
+ FILTER_PREFIX "color empty" );
p_filter->p_sys->ballColor = RED;
}
else
free( psz_method );
p_filter->p_sys->i_ballSize =
- var_CreateGetIntegerCommand( p_filter, FILTER_PREFIX "ball-size" );
+ var_CreateGetIntegerCommand( p_filter, FILTER_PREFIX "size" );
p_filter->p_sys->i_ballSpeed =
- var_CreateGetIntegerCommand( p_filter, FILTER_PREFIX "ball-speed" );
+ var_CreateGetIntegerCommand( p_filter, FILTER_PREFIX "speed" );
p_filter->p_sys->b_edgeVisible =
var_CreateGetBoolCommand( p_filter, FILTER_PREFIX "edge-visible" );
p_filter->p_sys->i_gradThresh =
vlc_mutex_init( &p_filter->p_sys->lock );
- var_AddCallback( p_filter, FILTER_PREFIX "ball-color",
+ var_AddCallback( p_filter, FILTER_PREFIX "color",
ballCallback, p_filter->p_sys );
- var_AddCallback( p_filter, FILTER_PREFIX "ball-size",
+ var_AddCallback( p_filter, FILTER_PREFIX "size",
ballCallback, p_filter->p_sys );
- var_AddCallback( p_filter, FILTER_PREFIX "ball-speed",
+ var_AddCallback( p_filter, FILTER_PREFIX "speed",
ballCallback, p_filter->p_sys );
var_AddCallback( p_filter, FILTER_PREFIX "edge-visible",
ballCallback, p_filter->p_sys );
filter_t *p_filter = (filter_t *)p_this;
filter_sys_t *p_sys = p_filter->p_sys;
+ var_DelCallback( p_filter, FILTER_PREFIX "color",
+ ballCallback, p_sys );
+ var_DelCallback( p_filter, FILTER_PREFIX "size",
+ ballCallback, p_sys );
+ var_DelCallback( p_filter, FILTER_PREFIX "speed",
+ ballCallback, p_sys );
+ var_DelCallback( p_filter, FILTER_PREFIX "edge-visible",
+ ballCallback, p_sys );
+
vlc_mutex_destroy( &p_sys->lock );
image_HandlerDelete( p_sys->p_image );
msg_Err( p_this, "Test" );
vlc_mutex_lock( &p_sys->lock );
- if( !strcmp( psz_var, FILTER_PREFIX "ball-color" ) )
+ if( !strcmp( psz_var, FILTER_PREFIX "color" ) )
{
p_sys->ballColor = getBallColor( p_this, newval.psz_string );
}
- else if( !strcmp( psz_var, FILTER_PREFIX "ball-size" ) )
+ else if( !strcmp( psz_var, FILTER_PREFIX "size" ) )
{
p_sys->i_ballSize = newval.i_int;
}
- else if( !strcmp( psz_var, FILTER_PREFIX "ball-speed" ) )
+ else if( !strcmp( psz_var, FILTER_PREFIX "speed" ) )
{
p_sys->i_ballSpeed = newval.i_int;
}
/*****************************************************************************
- * ballCallback
+ * getBallColor
*****************************************************************************
* Get and assign the ball color value
*****************************************************************************/