Patch by Bernie Purcell :

[vlc] / modules / video_filter / marq.c

diff --git a/modules/video_filter/marq.c b/modules/video_filter/marq.c
index f71ffd12427529219932d021be7b1d7f7c5c6dce..5134b4b57d24768b5c83a793756a88ebc3c09475 100644 (file)
--- a/modules/video_filter/marq.c
+++ b/modules/video_filter/marq.c
@@ -144,10 +144,10 @@ vlc_module_begin();
     add_integer( CFG_PREFIX "x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, VLC_TRUE );
     add_integer( CFG_PREFIX "y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, VLC_TRUE );
     add_integer( CFG_PREFIX "position", 5, NULL, POS_TEXT, POS_LONGTEXT, VLC_FALSE );
+        change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
 
     set_section( N_("Font"), NULL );
     /* 5 sets the default to top [1] left [4] */
-    change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
     add_integer_with_range( CFG_PREFIX "opacity", 255, 0, 255, NULL,
         OPACITY_TEXT, OPACITY_LONGTEXT, VLC_FALSE );
     add_integer( CFG_PREFIX "color", 0xFFFFFF, NULL, COLOR_TEXT, COLOR_LONGTEXT,
@@ -192,7 +192,7 @@ static int CreateFilter( vlc_object_t *p_this )
                        p_filter->p_cfg );
 
 #define CREATE_VAR( stor, type, var ) \
-    p_sys->stor = var_CreateGet##type( p_filter, var ); \
+    p_sys->stor = var_CreateGet##type##Command( p_filter, var ); \
     var_AddCallback( p_filter, var, MarqueeCallback, p_sys );
 
     CREATE_VAR( i_xoff, Integer, "marq-x" );
@@ -296,14 +296,14 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
     /*  where to locate the string: */
     if( p_sys->i_xoff < 0 || p_sys->i_yoff < 0 )
     {   /* set to one of the 9 relative locations */
-        p_spu->i_flags = p_sys->i_pos;
+        p_spu->p_region->i_align = p_sys->i_pos;
         p_spu->i_x = 0;
         p_spu->i_y = 0;
         p_spu->b_absolute = VLC_FALSE;
     }
     else
     {   /*  set to an absolute xy, referenced to upper left corner */
-        p_spu->i_flags = OSD_ALIGN_LEFT | OSD_ALIGN_TOP;
+        p_spu->p_region->i_align = OSD_ALIGN_LEFT | OSD_ALIGN_TOP;
         p_spu->i_x = p_sys->i_xoff;
         p_spu->i_y = p_sys->i_yoff;
         p_spu->b_absolute = VLC_TRUE;