X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvideo_text.c;h=bb77890cfa73e037929d642037de5b2c09a32373;hb=830bfb51bcd76d72fb9849281dde281018e0095f;hp=6480f63a9c572261f77a9423c0465dbd6b956a79;hpb=d3fe7f28797d4dba65ffcdd60bf932e758a48a9e;p=vlc

diff --git a/src/video_output/video_text.c b/src/video_output/video_text.c
index 6480f63a9c..bb77890cfa 100644
--- a/src/video_output/video_text.c
+++ b/src/video_output/video_text.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * video_text.c : text manipulation functions
  *****************************************************************************
- * Copyright (C) 1999-2004 the VideoLAN team
+ * Copyright (C) 1999-2007 the VideoLAN team
  * $Id$
  *
  * Author: Sigmund Augdal Helberg <dnumgis@videolan.org>
@@ -21,6 +21,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_vout.h>
 #include <vlc_block.h>
@@ -65,12 +69,13 @@ int vout_ShowTextRelative( vout_thread_t *p_vout, int i_channel,
  *               is about to be shown
  */
 int vout_ShowTextAbsolute( vout_thread_t *p_vout, int i_channel,
-                           char *psz_string, text_style_t *p_style,
+                           const char *psz_string, text_style_t *p_style,
                            int i_flags, int i_hmargin, int i_vmargin,
                            mtime_t i_start, mtime_t i_stop )
 {
     subpicture_t *p_spu;
     video_format_t fmt;
+    /* (void)p_style; FIXME: <-- why ask for this if it's unused?!? */
 
     if( !psz_string ) return VLC_EGENERIC;
 
@@ -92,14 +97,16 @@ int vout_ShowTextAbsolute( vout_thread_t *p_vout, 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->b_fade = true;
 
     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_vout->p_spu, p_spu );
@@ -116,7 +123,7 @@ int vout_ShowTextAbsolute( vout_thread_t *p_vout, int i_channel,
  * \param psz_format printf style formatting
  **/
 void __vout_OSDMessage( vlc_object_t *p_caller, int i_channel,
-                        char *psz_format, ... )
+                        const char *psz_format, ... )
 {
     vout_thread_t *p_vout;
     char *psz_string;