# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_vout.h>
#include <vlc_block.h>
#include <vlc_filter.h>
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) );
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->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;
+ p_spu->p_region->i_x = i_hmargin;
+ p_spu->p_region->i_y = i_vmargin;
spu_DisplaySubpicture( p_spu_channel, p_spu );
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 );
}
}