/*****************************************************************************
* 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
*
* 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
int i_flags, int i_hmargin, int i_vmargin,
mtime_t i_duration )
{
- subpicture_t *p_subpic = NULL;
mtime_t i_now = mdate();
- if( p_vout->p_text && p_vout->p_text->p_module &&
- p_vout->p_text->pf_render_string )
- {
- block_t *p_block = block_New( p_vout, strlen(psz_string) + 1 );
- if( p_block )
- {
- memcpy( p_block->p_buffer, psz_string, p_block->i_buffer );
- p_block->i_pts = p_block->i_dts = i_now;
- p_block->i_length = i_duration;
-
- p_subpic = p_vout->p_text->pf_render_string( p_vout->p_text,
- p_block );
- if( p_subpic )
- {
- p_subpic->i_x = i_hmargin;
- p_subpic->i_y = i_vmargin;
- p_subpic->i_flags = i_flags;
- p_subpic->i_channel = i_channel;
-
- vout_DisplaySubPicture( p_vout, p_subpic );
- return VLC_SUCCESS;
- }
- }
- return VLC_EGENERIC;
- }
- else
- {
- msg_Warn( p_vout, "No text renderer found" );
- return VLC_EGENERIC;
- }
+ return vout_ShowTextAbsolute( p_vout, i_channel, psz_string,
+ p_style, i_flags, i_hmargin, i_vmargin,
+ i_now, i_now + i_duration );
}
/**
* 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_subpic = NULL;
-
- if( p_vout->p_text && p_vout->p_text->p_module &&
- p_vout->p_text->pf_render_string )
+ 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 = spu_CreateSubpicture( p_vout->p_spu );
+ if( !p_spu ) return VLC_EGENERIC;
+
+ /* Create a new subpicture region */
+ memset( &fmt, 0, sizeof(video_format_t) );
+ fmt.i_chroma = VLC_FOURCC('T','E','X','T');
+ fmt.i_aspect = 0;
+ fmt.i_width = fmt.i_height = 0;
+ fmt.i_x_offset = fmt.i_y_offset = 0;
+ p_spu->p_region = p_spu->pf_create_region( VLC_OBJECT(p_vout), &fmt );
+ if( !p_spu->p_region )
{
- block_t *p_block = block_New( p_vout, strlen(psz_string) + 1 );
- if( p_block )
- {
- memcpy( p_block->p_buffer, psz_string, p_block->i_buffer );
- p_block->i_pts = p_block->i_dts = i_start;
- p_block->i_length = i_stop - i_start;
-
- p_subpic = p_vout->p_text->pf_render_string( p_vout->p_text,
- p_block );
- if( p_subpic )
- {
- p_subpic->i_x = i_hmargin;
- p_subpic->i_y = i_vmargin;
- p_subpic->i_flags = i_flags;
- p_subpic->i_channel = i_channel;
-
- vout_DisplaySubPicture( p_vout, p_subpic );
- return VLC_SUCCESS;
- }
- }
- return VLC_EGENERIC;
- }
- else
- {
- msg_Warn( p_vout, "No text renderer found" );
+ msg_Err( p_vout, "cannot allocate SPU region" );
+ 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 = 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 & ~SUBPICTURE_ALIGN_MASK;
+ p_spu->i_channel = i_channel;
+
+ spu_DisplaySubpicture( p_vout->p_spu, p_spu );
+
+ return VLC_SUCCESS;
}
* \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;
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 );
va_end( args );
}
}
-
projects / vlc / blobdiff