From: Rémi Duraffort <ivoire@videolan.org>
Date: Fri, 26 Jun 2009 09:14:19 +0000 (+0200)
Subject: Marquee: remove a double var_AddCallback and add a missing var_DelCallback.
X-Git-Tag: 1.1.0-ff~5231
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=511fccb7ca9551df7a8a020be32163d19a2914ab;p=vlc

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

diff --git a/modules/video_filter/marq.c b/modules/video_filter/marq.c
index f993907d4d..a74d0e3b76 100644
--- a/modules/video_filter/marq.c
+++ b/modules/video_filter/marq.c
@@ -222,9 +222,8 @@ static int CreateFilter( vlc_object_t *p_this )
     var_AddCallback( p_filter, "marq-refresh", MarqueeCallback, p_sys );
     CREATE_VAR( i_pos, Integer, "marq-position" );
     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, "marq-opacity" );
+    p_sys->p_style->i_font_alpha = 255 - var_CreateGetIntegerCommand( p_filter,
+                                                            "marq-opacity" );
     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_size, Integer, "marq-size" );
@@ -249,11 +248,12 @@ static void DestroyFilter( vlc_object_t *p_this )
     var_Destroy( p_filter, var );
     DEL_VAR( "marq-x" );
     DEL_VAR( "marq-y" );
-    DEL_VAR( "marq-marquee" );
     DEL_VAR( "marq-timeout" );
+    DEL_VAR( "marq-refresh" );
     DEL_VAR( "marq-position" );
-    DEL_VAR( "marq-color" );
+    DEL_VAR( "marq-marquee" );
     DEL_VAR( "marq-opacity" );
+    DEL_VAR( "marq-color" );
     DEL_VAR( "marq-size" );
 
     vlc_mutex_destroy( &p_sys->lock );