Removed OSD_ALIGN_* flags.

SUBPICTURE_ALIGN_* must be used instead.

include/vlc_osd.h

@@ -207,12 +207,6 @@ VLC_EXPORT( void, spu_RenderSubpictures, ( spu_t *,  picture_t *, const video_fo
 /**
  * OSD menu position and picture type defines
  */
-
-#define OSD_ALIGN_LEFT 0x1
-#define OSD_ALIGN_RIGHT 0x2
-#define OSD_ALIGN_TOP 0x4
-#define OSD_ALIGN_BOTTOM 0x8
-
 #define OSD_HOR_SLIDER 1
 #define OSD_VERT_SLIDER 2
 

modules/gui/fbosd.c

@@ -861,7 +861,7 @@ static picture_t *RenderText( intf_thread_t *p_intf, const char *psz_string,
             return NULL;
         }
         p_region->p_style = text_style_Duplicate( p_style );
-        p_region->i_align = OSD_ALIGN_LEFT | OSD_ALIGN_TOP;
+        p_region->i_align = SUBPICTURE_ALIGN_LEFT | SUBPICTURE_ALIGN_TOP;
 
         if( p_sys->p_text->pf_render_text )
         {

modules/video_filter/audiobargraph_v.c

@@ -361,7 +361,7 @@ static subpicture_t *FilterSub( filter_t *p_filter, mtime_t date )
     /*  where to locate the bar graph: */
     if( p_sys->i_pos < 0 )
     {   /*  set to an absolute xy */
-        p_region->i_align = OSD_ALIGN_RIGHT | OSD_ALIGN_TOP;
+        p_region->i_align = SUBPICTURE_ALIGN_RIGHT | SUBPICTURE_ALIGN_TOP;
         p_spu->b_absolute = true;
     }
     else

modules/video_filter/dynamicoverlay/dynamicoverlay.c

@@ -375,7 +375,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
         }
         p_region->i_x = p_overlay->i_x;
         p_region->i_y = p_overlay->i_y;
-        p_region->i_align = OSD_ALIGN_LEFT | OSD_ALIGN_TOP;
+        p_region->i_align = SUBPICTURE_ALIGN_LEFT | SUBPICTURE_ALIGN_TOP;
         p_region->i_alpha = p_overlay->i_alpha;
         pp_region = &p_region->p_next;
     }

modules/video_filter/logo.c

@@ -400,7 +400,7 @@ static subpicture_t *FilterSub( filter_t *p_filter, mtime_t date )
     /*  where to locate the logo: */
     if( p_sys->i_pos < 0 )
     {   /*  set to an absolute xy */
-        p_region->i_align = OSD_ALIGN_RIGHT | OSD_ALIGN_TOP;
+        p_region->i_align = SUBPICTURE_ALIGN_RIGHT | SUBPICTURE_ALIGN_TOP;
         p_spu->b_absolute = true;
     }
     else

modules/video_filter/marq.c

@@ -313,7 +313,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
     /*  where to locate the string: */
     if( p_sys->i_pos < 0 )
     {   /*  set to an absolute xy */
-        p_spu->p_region->i_align = OSD_ALIGN_LEFT | OSD_ALIGN_TOP;
+        p_spu->p_region->i_align = SUBPICTURE_ALIGN_LEFT | SUBPICTURE_ALIGN_TOP;
         p_spu->b_absolute = true;
     }
     else

modules/video_filter/rss.c

@@ -484,7 +484,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
     /*  where to locate the string: */
     if( p_sys->i_pos < 0 )
     {   /*  set to an absolute xy */
-        p_spu->p_region->i_align = OSD_ALIGN_LEFT | OSD_ALIGN_TOP;
+        p_spu->p_region->i_align = SUBPICTURE_ALIGN_LEFT | SUBPICTURE_ALIGN_TOP;
         p_spu->b_absolute = true;
     }
     else

src/osd/osd_text.c

@@ -131,7 +131,7 @@ void osd_Message( spu_t *p_spu, int i_channel,
         if( vasprintf( &psz_string, psz_format, args ) != -1 )
         {
             osd_ShowTextRelative( p_spu, i_channel, psz_string, NULL,
-                    OSD_ALIGN_TOP|OSD_ALIGN_RIGHT, 30,20,1000000 );
+                    SUBPICTURE_ALIGN_TOP|SUBPICTURE_ALIGN_RIGHT, 30,20,1000000 );
 
             free( psz_string );
         }

src/video_output/video_text.c

@@ -143,7 +143,7 @@ void vout_OSDMessage( vlc_object_t *p_caller, int i_channel,
         if( vasprintf( &psz_string, psz_format, args ) != -1 )
         {
             vout_ShowTextRelative( p_vout, i_channel, psz_string, NULL,
-                                   OSD_ALIGN_TOP|OSD_ALIGN_RIGHT,
+                                   SUBPICTURE_ALIGN_TOP|SUBPICTURE_ALIGN_RIGHT,
                                    30 + p_vout->p->fmt_in.i_width
                                       - p_vout->p->fmt_in.i_visible_width
                                       - p_vout->p->fmt_in.i_x_offset,