Removed OSD_ALIGN_* flags.

SUBPICTURE_ALIGN_* must be used instead.

diff --git a/include/vlc_osd.h b/include/vlc_osd.h
index ec80d07f6981c114c3963472e2e83c0fb9ce0e93..5fc747299249e94388a44a23179cbd52ca1e550d 100644 (file)
--- a/include/vlc_osd.h
+++ b/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
 

diff --git a/modules/gui/fbosd.c b/modules/gui/fbosd.c
index c2b6c3f0a7e2be55bc72e8fbfaa1e4030cd1b21d..facbb7ad41e4d16a0496a75615717d59a5b52c6b 100644 (file)
--- a/modules/gui/fbosd.c
+++ b/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 )
         {

diff --git a/modules/video_filter/audiobargraph_v.c b/modules/video_filter/audiobargraph_v.c
index 44359cc8876002d766c9c1e215325656a108755c..3d16738ec9d5c25d1986e3502822d7bf52a0c70b 100644 (file)
--- a/modules/video_filter/audiobargraph_v.c
+++ b/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

diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay.c b/modules/video_filter/dynamicoverlay/dynamicoverlay.c
index 0c7c68a44bca8af5e43f97566a277f71e71cdcaf..8378480cea1668c60fe2c5b01020141a235ddb70 100644 (file)
--- a/modules/video_filter/dynamicoverlay/dynamicoverlay.c
+++ b/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;
     }

diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c
index 37f8eeedd2b4bd4a578593a9d1df67195046d14e..6db8e4d67c52c233748f866382f70ab56a9fd5a2 100644 (file)
--- a/modules/video_filter/logo.c
+++ b/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

diff --git a/modules/video_filter/marq.c b/modules/video_filter/marq.c
index f90dafa48ec6e6b060c99962ede1eafad3b4a58e..3365530a77a3809676ebe319bd5e2300947b4055 100644 (file)
--- a/modules/video_filter/marq.c
+++ b/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

diff --git a/modules/video_filter/rss.c b/modules/video_filter/rss.c
index f6ae1722faaae93013a48241eac1c9b3d3987691..91c573c5c06c47b5eb791529f28c1a0c6768295e 100644 (file)
--- a/modules/video_filter/rss.c
+++ b/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

diff --git a/src/osd/osd_text.c b/src/osd/osd_text.c
index 916a50c786acb358f3637a4bc9aafaaec3d840ba..da24083b283fa0dc242e43717338543ea5d9509f 100644 (file)
--- a/src/osd/osd_text.c
+++ b/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 );
         }

diff --git a/src/video_output/video_text.c b/src/video_output/video_text.c
index e0f15bbc62bc5c52e7e90d3272cf1b3f1d2137c9..003a630ad90f9c658a129a9b80988a43d6d6684b 100644 (file)
--- a/src/video_output/video_text.c
+++ b/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,