libvlc: use vlc_common.h (libvlccore) instead of vlc/vlc.h

[vlc] / src / video_output / video_text.c

diff --git a/src/video_output/video_text.c b/src/video_output/video_text.c
index 76b5677e85a655f3fc6c71020fa83743b1f81a0f..d98532284ebcc843da9035136d1cffa3890e47c5 100644 (file)
--- a/src/video_output/video_text.c
+++ b/src/video_output/video_text.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
  * video_text.c : text manipulation functions
  *****************************************************************************
- * Copyright (C) 1999-2004 VideoLAN
+ * Copyright (C) 1999-2007 the VideoLAN team
  * $Id$
  *
- * Author: Sigmund Augdal <sigmunau@idi.ntnu.no>
+ * Author: Sigmund Augdal Helberg <dnumgis@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,12 +18,18 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
-#include <vlc/vout.h>
-#include "vlc_block.h"
-#include "vlc_filter.h"
-#include "osd.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>
 
 /**
  * \brief Show text on the video for some time
@@ -63,16 +69,17 @@ 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;
 
-    p_spu = vout_CreateSubPicture( p_vout, !DEFAULT_CHAN, MEMORY_SUBPICTURE );
+    p_spu = spu_CreateSubpicture( p_vout->p_spu );
     if( !p_spu ) return VLC_EGENERIC;
 
     /* Create a new subpicture region */
@@ -85,22 +92,24 @@ int vout_ShowTextAbsolute( vout_thread_t *p_vout, int i_channel,
     if( !p_spu->p_region )
     {
         msg_Err( p_vout, "cannot allocate SPU region" );
-        vout_DestroySubPicture( p_vout, p_spu );
+        spu_DestroySubpicture( p_vout->p_spu, p_spu );
         return VLC_EGENERIC;
     }
 
     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 = 0;
-    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;
 
-    vout_DisplaySubPicture( p_vout, p_spu );
+    spu_DisplaySubpicture( p_vout->p_spu, p_spu );
 
     return VLC_SUCCESS;
 }
@@ -114,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;
@@ -123,14 +132,17 @@ void __vout_OSDMessage( vlc_object_t *p_caller, int i_channel,
     if( !config_GetInt( p_caller, "osd" ) ) return;
 
     p_vout = vlc_object_find( p_caller, VLC_OBJECT_VOUT, FIND_ANYWHERE );
-
     if( p_vout )
     {
         va_start( args, psz_format );
         vasprintf( &psz_string, psz_format, args );
 
         vout_ShowTextRelative( p_vout, i_channel, psz_string, NULL,
-                               OSD_ALIGN_TOP|OSD_ALIGN_RIGHT, 30,20,1000000 );
+                               OSD_ALIGN_TOP|OSD_ALIGN_RIGHT,
+                               30 + p_vout->fmt_in.i_width
+                                  - p_vout->fmt_in.i_visible_width
+                                  - p_vout->fmt_in.i_x_offset,
+                               20 + p_vout->fmt_in.i_y_offset, 1000000 );
 
         vlc_object_release( p_vout );
         free( psz_string );