/* 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 );
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( !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;
}