[vlc-devel] commit: Marquee: remove a double var_AddCallback and add a missing var_DelCallback. ( Rémi Duraffort )

[git version control]

vlc | branch: 1.0-bugfix | Rémi Duraffort <ivoire at videolan.org> | Fri Jun 26 11:14:19 2009 +0200| [94e7a794511d151029b2f9e51eed9c800c1a70b9] | committer: Rémi Duraffort 

Marquee: remove a double var_AddCallback and add a missing var_DelCallback.
(cherry picked from commit 511fccb7ca9551df7a8a020be32163d19a2914ab)

Signed-off-by: Rémi Duraffort <ivoire at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=94e7a794511d151029b2f9e51eed9c800c1a70b9
---

 modules/video_filter/marq.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/video_filter/marq.c b/modules/video_filter/marq.c
index ce627d1..b98b824 100644
--- a/modules/video_filter/marq.c
+++ b/modules/video_filter/marq.c
@@ -224,9 +224,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" );
@@ -251,11 +250,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 );