#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
+#include <assert.h>
#include <vlc_common.h>
#include <vlc_vout.h>
#include <vlc_filter.h>
#include <vlc_osd.h>
+/* TODO remove access to private vout data */
+#include "vout_internal.h"
+
/**
* \brief Show text on the video for some time
* \param p_vout pointer to the vout the text is to be showed on
if( !psz_string ) return VLC_EGENERIC;
- p_spu = subpicture_New();
+ p_spu = subpicture_New( NULL );
if( !p_spu )
return VLC_EGENERIC;
/* Create a new subpicture region */
memset( &fmt, 0, sizeof(video_format_t) );
fmt.i_chroma = VLC_CODEC_TEXT;
- fmt.i_aspect = 0;
fmt.i_width = fmt.i_height = 0;
fmt.i_x_offset = fmt.i_y_offset = 0;
p_spu->p_region = subpicture_region_New( &fmt );
if( p_style )
p_spu->p_region->p_style = text_style_Duplicate( p_style );
- spu_DisplaySubpicture( p_vout->p_spu, p_spu );
+ spu_DisplaySubpicture( vout_GetSpu( p_vout ), p_spu );
return VLC_SUCCESS;
}
-
+#undef vout_OSDMessage
/**
* \brief Write an informative message at the default location,
* for the default duration and only if the OSD option is enabled.
* \param i_channel Subpicture channel
* \param psz_format printf style formatting
**/
-void __vout_OSDMessage( vlc_object_t *p_caller, int i_channel,
- const char *psz_format, ... )
+void vout_OSDMessage( vlc_object_t *p_caller, int i_channel,
+ const char *psz_format, ... )
{
vout_thread_t *p_vout;
char *psz_string = NULL;
va_list args;
- if( !config_GetInt( p_caller, "osd" ) ) return;
+ if( !var_InheritBool( p_caller, "osd" ) ) return;
p_vout = vlc_object_find( p_caller, VLC_OBJECT_VOUT, FIND_ANYWHERE );
if( p_vout )
if( vasprintf( &psz_string, psz_format, args ) != -1 )
{
vout_ShowTextRelative( p_vout, i_channel, psz_string, NULL,
- 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 );
+ SUBPICTURE_ALIGN_TOP|SUBPICTURE_ALIGN_RIGHT,
+ 30 + p_vout->p->fmt_in.i_width
+ - p_vout->p->fmt_in.i_visible_width
+ - p_vout->p->fmt_in.i_x_offset,
+ 20 + p_vout->p->fmt_in.i_y_offset, 1000000 );
free( psz_string );
}
vlc_object_release( p_vout );
if( !p_src )
return p_dst;
- /* */
- if( p_dst->psz_fontname )
- free( p_dst->psz_fontname );
-
/* */
*p_dst = *p_src;
- /* */
- if( p_dst->psz_fontname )
- p_dst->psz_fontname = strdup( p_dst->psz_fontname );
+ if( p_src->psz_fontname )
+ p_dst->psz_fontname = strdup( p_src->psz_fontname );
return p_dst;
}