Fix menu removal of accelerators. This has yet to be more FIXMEd (jpeg :D)

[vlc] / src / osd / osd_text.c

diff --git a/src/osd/osd_text.c b/src/osd/osd_text.c
index 39cf6d1d5bb59ca4960c0f8663d4b36fb9f946e5..2386d30e3c799f709fa5f7f8e85c783a1e8b866f 100644 (file)
--- a/src/osd/osd_text.c
+++ b/src/osd/osd_text.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * osd_text.c : text manipulation functions
  *****************************************************************************
- * Copyright (C) 1999-2005 the VideoLAN team
+ * Copyright (C) 1999-2007 the VideoLAN team
  * $Id$
  *
  * Author: Sigmund Augdal Helberg <dnumgis@videolan.org>
@@ -20,8 +20,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
- 
-#include <vlc/vout.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_vout.h>
 #include <vlc_block.h>
 #include <vlc_filter.h>
 #include <vlc_osd.h>
@@ -70,6 +74,7 @@ int osd_ShowTextAbsolute( spu_t *p_spu_channel, int i_channel,
 {
     subpicture_t *p_spu;
     video_format_t fmt;
+    (void)p_style;
 
     if( !psz_string ) return VLC_EGENERIC;
 
@@ -91,14 +96,15 @@ int osd_ShowTextAbsolute( spu_t *p_spu_channel, int i_channel,
     }
 
     p_spu->p_region->psz_text = strdup( psz_string );
+    p_spu->p_region->i_align = i_flags & SUBPICTURE_ALIGN_MASK;
     p_spu->i_start = i_start;
     p_spu->i_stop = i_stop;
-    p_spu->b_ephemer = VLC_TRUE;
-    p_spu->b_absolute = VLC_FALSE;
+    p_spu->b_ephemer = true;
+    p_spu->b_absolute = false;
 
     p_spu->i_x = i_hmargin;
     p_spu->i_y = i_vmargin;
-    p_spu->i_flags = i_flags;
+    p_spu->i_flags = i_flags & ~SUBPICTURE_ALIGN_MASK;
     p_spu->i_channel = i_channel;
 
     spu_DisplaySubpicture( p_spu_channel, p_spu );