Removed unused or redondant fields from subpicture.

[vlc] / src / osd / osd_text.c

diff --git a/src/osd/osd_text.c b/src/osd/osd_text.c
index 330e20258a850b1f609172cf7347b97510e94c5c..ea2c969ac4d6919b7fffd127fb694d922b227bb5 100644 (file)
--- a/src/osd/osd_text.c
+++ b/src/osd/osd_text.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
  * osd_text.c : text manipulation functions
  *****************************************************************************
- * Copyright (C) 1999-2005 the VideoLAN team
+ * 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,10 +18,14 @@
  *
  * 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>
+#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,11 +74,19 @@ 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;
 
     p_spu = spu_CreateSubpicture( p_spu_channel );
-    if( !p_spu ) return VLC_EGENERIC;
+    if( !p_spu )
+        return VLC_EGENERIC;
+
+    p_spu->i_channel = i_channel;
+    p_spu->i_start = i_start;
+    p_spu->i_stop = i_stop;
+    p_spu->b_ephemer = true;
+    p_spu->b_absolute = false;
 
     /* Create a new subpicture region */
     memset( &fmt, 0, sizeof(video_format_t) );
@@ -91,15 +103,9 @@ int osd_ShowTextAbsolute( spu_t *p_spu_channel, int i_channel,
     }
 
     p_spu->p_region->psz_text = strdup( psz_string );
-    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->i_x = i_hmargin;
-    p_spu->i_y = i_vmargin;
-    p_spu->i_flags = i_flags;
-    p_spu->i_channel = i_channel;
+    p_spu->p_region->i_align = i_flags & SUBPICTURE_ALIGN_MASK;
+    p_spu->p_region->i_x = i_hmargin;
+    p_spu->p_region->i_y = i_vmargin;
 
     spu_DisplaySubpicture( p_spu_channel, p_spu );
 
@@ -117,18 +123,19 @@ int osd_ShowTextAbsolute( spu_t *p_spu_channel, int i_channel,
 void osd_Message( spu_t *p_spu, int i_channel,
                         char *psz_format, ... )
 {
-    char *psz_string;
     va_list args;
 
     if( p_spu )
     {
+        char *psz_string;
         va_start( args, psz_format );
-        vasprintf( &psz_string, psz_format, args );
-
-        osd_ShowTextRelative( p_spu, i_channel, psz_string, NULL,
-                               OSD_ALIGN_TOP|OSD_ALIGN_RIGHT, 30,20,1000000 );
+        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 );
 
-        free( psz_string );
+            free( psz_string );
+        }
         va_end( args );
     }
 }