#include <vlc_common.h>
#include <vlc_plugin.h>
-#include <vlc_osd.h>
#include <vlc_filter.h>
#include <vlc_stream.h>
#include <vlc_xml.h>
#ifdef HAVE_FONTCONFIG
#define FONT_LONGTEXT N_("Font family for the font you want to use")
#else
-#define FONT_LONGTEXT N_("Fontfile for the font you want to use")
+#define FONT_LONGTEXT N_("Font file for the font you want to use")
#endif
#define FONTSIZE_TEXT N_("Font size in pixels")
#define FONTSIZER_TEXT N_("Relative font size")
#define FONTSIZER_LONGTEXT N_("This is the relative default size of the " \
"fonts that will be rendered on the video. If absolute font size is set, "\
- "relative size will be overriden." )
+ "relative size will be overridden." )
static const int pi_sizes[] = { 20, 18, 16, 12, 6 };
static const char *const ppsz_sizes_text[] = {
}
#ifdef HAVE_FONTCONFIG
- /* Lets find some fontfile from freetype-font variable family */
- char *psz_fontsize;
- if( asprintf( &psz_fontsize, "%d", p_sys->i_default_font_size ) == -1 )
- goto error;
+ msg_Dbg( p_filter, "Building font databases.");
+ mtime_t t1, t2;
+ t1 = mdate();
#ifdef WIN32
- dialog_progress_bar_t *p_dialog = dialog_ProgressCreate( p_filter,
+ dialog_progress_bar_t *p_dialog = NULL;
+ FcConfig *fcConfig = FcInitLoadConfig();
+
+ p_dialog = dialog_ProgressCreate( p_filter,
_("Building font cache"),
_("Please wait while your font cache is rebuilt.\n"
"This should take less than a few minutes."), NULL );
- char *path = xmalloc( PATH_MAX + 1 );
- /* Fontconfig doesnt seem to know where windows fonts are with
- * current contribs. So just tell default windows font directory
- * is the place to search fonts
- */
- GetWindowsDirectory( path, PATH_MAX + 1 );
- strcat( path, "\\fonts" );
- if( p_dialog )
- dialog_ProgressSet( p_dialog, NULL, 0.4 );
-
- FcConfigAppFontAddDir( NULL , path );
- free(path);
-
if( p_dialog )
dialog_ProgressSet( p_dialog, NULL, 0.5 );
-#endif
- mtime_t t1, t2;
- msg_Dbg( p_filter, "Building font database.");
- t1 = mdate();
- FcConfigBuildFonts( NULL );
+ FcConfigBuildFonts( fcConfig );
t2 = mdate();
-
- msg_Dbg( p_filter, "Finished building font database." );
msg_Dbg( p_filter, "Took %ld microseconds", (long)((t2 - t1)) );
- fontpattern = FcPatternCreate();
+ if( p_dialog )
+ {
+ dialog_ProgressSet( p_dialog, NULL, 1.0 );
+ dialog_ProgressDestroy( p_dialog );
+ p_dialog = NULL;
+ }
+#endif
+ /* Lets find some fontfile from freetype-font variable family */
+ char *psz_fontsize;
+ if( asprintf( &psz_fontsize, "%d", p_sys->i_default_font_size ) == -1 )
+ goto error;
+ fontpattern = FcPatternCreate();
if( !fontpattern )
{
msg_Err( p_filter, "Creating fontpattern failed");
goto error;
}
-#ifdef WIN32
- if( p_dialog )
- dialog_ProgressSet( p_dialog, NULL, 0.7 );
-#endif
FcPatternAddString( fontpattern, FC_FAMILY, psz_fontfamily);
FcPatternAddString( fontpattern, FC_SIZE, psz_fontsize );
free( psz_fontsize );
}
FcDefaultSubstitute( fontpattern );
-#ifdef WIN32
- if( p_dialog )
- dialog_ProgressSet( p_dialog, NULL, 0.8 );
-#endif
/* testing fontresult here doesn't do any good really, but maybe it will
* in future as fontconfig code doesn't set it in all cases and just
* returns NULL or doesn't set to to Match on all Match cases.*/
msg_Dbg( p_filter, "Using %s as font from file %s", psz_fontfamily,
psz_fontfile ? psz_fontfile : "(null)" );
p_sys->psz_fontfamily = strdup( psz_fontfamily );
-# ifdef WIN32
- if( p_dialog )
- {
- dialog_ProgressSet( p_dialog, NULL, 1.0 );
- dialog_ProgressDestroy( p_dialog );
- p_dialog = NULL;
- }
-# endif
#else
-#ifdef HAVE_FONTCONFIG
- p_sys->psz_fontfamily = strdup( DEFAULT_FONT );
psz_fontfile = psz_fontfamily;
-#endif
#endif
static int LoadFontsFromAttachments( filter_t *p_filter )
{
filter_sys_t *p_sys = p_filter->p_sys;
- input_thread_t *p_input;
input_attachment_t **pp_attachments;
int i_attachments_cnt;
- int k;
- int rv = VLC_SUCCESS;
-
- p_input = (input_thread_t *)vlc_object_find( p_filter, VLC_OBJECT_INPUT, FIND_PARENT );
- if( ! p_input )
- return VLC_EGENERIC;
- if( VLC_SUCCESS != input_Control( p_input, INPUT_GET_ATTACHMENTS, &pp_attachments, &i_attachments_cnt ))
- {
- vlc_object_release(p_input);
+ if( filter_GetInputAttachments( p_filter, &pp_attachments, &i_attachments_cnt ) )
return VLC_EGENERIC;
- }
p_sys->i_font_attachments = 0;
p_sys->pp_font_attachments = malloc( i_attachments_cnt * sizeof( input_attachment_t * ));
- if(! p_sys->pp_font_attachments )
- rv = VLC_ENOMEM;
+ if( !p_sys->pp_font_attachments )
+ return VLC_ENOMEM;
- for( k = 0; k < i_attachments_cnt; k++ )
+ for( int k = 0; k < i_attachments_cnt; k++ )
{
input_attachment_t *p_attach = pp_attachments[k];
- if( p_sys->pp_font_attachments )
+ if( ( !strcmp( p_attach->psz_mime, "application/x-truetype-font" ) || // TTF
+ !strcmp( p_attach->psz_mime, "application/x-font-otf" ) ) && // OTF
+ p_attach->i_data > 0 && p_attach->p_data )
{
- if(( !strcmp( p_attach->psz_mime, "application/x-truetype-font" ) || // TTF
- !strcmp( p_attach->psz_mime, "application/x-font-otf" ) ) && // OTF
- ( p_attach->i_data > 0 ) &&
- ( p_attach->p_data != NULL ) )
- {
- p_sys->pp_font_attachments[ p_sys->i_font_attachments++ ] = p_attach;
- }
- else
- {
- vlc_input_attachment_Delete( p_attach );
- }
+ p_sys->pp_font_attachments[ p_sys->i_font_attachments++ ] = p_attach;
}
else
{
}
free( pp_attachments );
- vlc_object_release(p_input);
-
- return rv;
+ return VLC_SUCCESS;
}
/*****************************************************************************
}
p_line->p_glyph_pos[ i ].x = i_pen_x;
p_line->p_glyph_pos[ i ].y = i_pen_y;
- i_error = FT_Load_Glyph( face, i_glyph_index, FT_LOAD_DEFAULT );
+ i_error = FT_Load_Glyph( face, i_glyph_index, FT_LOAD_NO_BITMAP | FT_LOAD_DEFAULT );
if( i_error )
{
- msg_Err( p_filter, "unable to render text FT_Load_Glyph returned"
- " %d", i_error );
- goto error;
+ i_error = FT_Load_Glyph( face, i_glyph_index, FT_LOAD_DEFAULT );
+ if( i_error )
+ {
+ msg_Err( p_filter, "unable to render text FT_Load_Glyph returned"
+ " %d", i_error );
+ goto error;
+ }
}
i_error = FT_Get_Glyph( glyph, &tmp_glyph );
if( i_error )
p_line->p_glyph_pos[ i ].x = *pi_pen_x;
p_line->p_glyph_pos[ i ].y = i_pen_y;
- i_error = FT_Load_Glyph( p_face, i_glyph_index, FT_LOAD_DEFAULT );
+ i_error = FT_Load_Glyph( p_face, i_glyph_index, FT_LOAD_NO_BITMAP | FT_LOAD_DEFAULT );
if( i_error )
{
- msg_Err( p_filter,
- "unable to render text FT_Load_Glyph returned %d", i_error );
- p_line->pp_glyphs[ i ] = NULL;
- return VLC_EGENERIC;
+ i_error = FT_Load_Glyph( p_face, i_glyph_index, FT_LOAD_DEFAULT );
+ if( i_error )
+ {
+ msg_Err( p_filter,
+ "unable to render text FT_Load_Glyph returned %d", i_error );
+ p_line->pp_glyphs[ i ] = NULL;
+ return VLC_EGENERIC;
+ }
}
/* Do synthetic styling now that Freetype supports it;
projects / vlc / blobdiff