Commit 511fccb7 authored by Rémi Duraffort's avatar Rémi Duraffort

Marquee: remove a double var_AddCallback and add a missing var_DelCallback.

parent f37f5180
...@@ -222,9 +222,8 @@ static int CreateFilter( vlc_object_t *p_this ) ...@@ -222,9 +222,8 @@ static int CreateFilter( vlc_object_t *p_this )
var_AddCallback( p_filter, "marq-refresh", MarqueeCallback, p_sys ); var_AddCallback( p_filter, "marq-refresh", MarqueeCallback, p_sys );
CREATE_VAR( i_pos, Integer, "marq-position" ); CREATE_VAR( i_pos, Integer, "marq-position" );
CREATE_VAR( psz_marquee, String, "marq-marquee" ); CREATE_VAR( psz_marquee, String, "marq-marquee" );
CREATE_VAR( p_style->i_font_alpha, Integer, "marq-opacity" ); p_sys->p_style->i_font_alpha = 255 - var_CreateGetIntegerCommand( p_filter,
p_sys->p_style->i_font_alpha = "marq-opacity" );
255 - var_CreateGetIntegerCommand( p_filter, "marq-opacity" );
var_AddCallback( p_filter, "marq-opacity", MarqueeCallback, p_sys ); var_AddCallback( p_filter, "marq-opacity", MarqueeCallback, p_sys );
CREATE_VAR( p_style->i_font_color, Integer, "marq-color" ); CREATE_VAR( p_style->i_font_color, Integer, "marq-color" );
CREATE_VAR( p_style->i_font_size, Integer, "marq-size" ); CREATE_VAR( p_style->i_font_size, Integer, "marq-size" );
...@@ -249,11 +248,12 @@ static void DestroyFilter( vlc_object_t *p_this ) ...@@ -249,11 +248,12 @@ static void DestroyFilter( vlc_object_t *p_this )
var_Destroy( p_filter, var ); var_Destroy( p_filter, var );
DEL_VAR( "marq-x" ); DEL_VAR( "marq-x" );
DEL_VAR( "marq-y" ); DEL_VAR( "marq-y" );
DEL_VAR( "marq-marquee" );
DEL_VAR( "marq-timeout" ); DEL_VAR( "marq-timeout" );
DEL_VAR( "marq-refresh" );
DEL_VAR( "marq-position" ); DEL_VAR( "marq-position" );
DEL_VAR( "marq-color" ); DEL_VAR( "marq-marquee" );
DEL_VAR( "marq-opacity" ); DEL_VAR( "marq-opacity" );
DEL_VAR( "marq-color" );
DEL_VAR( "marq-size" ); DEL_VAR( "marq-size" );
vlc_mutex_destroy( &p_sys->lock ); vlc_mutex_destroy( &p_sys->lock );
......
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