/*****************************************************************************
* win32text.c : Text drawing routines using the TextOut win32 API
*****************************************************************************
- * Copyright (C) 2002 - 2005 the VideoLAN team
+ * Copyright (C) 2002 - 2009 the VideoLAN team
* $Id$
*
* Authors: Gildas Bazin <gbazin@videolan.org>
+ * Pierre Ynard
*
* 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
set_category( CAT_VIDEO )
set_subcategory( SUBCAT_VIDEO_SUBPIC )
- add_integer( "win32text-fontsize", 0, NULL, FONTSIZE_TEXT,
+ add_integer( "win32text-fontsize", 0, FONTSIZE_TEXT,
FONTSIZE_LONGTEXT, true )
/* opacity valid on 0..255, with default 255 = fully opaque */
OPACITY_TEXT, OPACITY_LONGTEXT, false )
/* hook to the color values list, with default 0x00ffffff = white */
- add_integer( "win32text-color", 0x00FFFFFF, NULL, COLOR_TEXT,
+ add_integer( "win32text-color", 0x00FFFFFF, COLOR_TEXT,
COLOR_LONGTEXT, true )
- change_integer_list( pi_color_values, ppsz_color_descriptions, NULL );
+ change_integer_list( pi_color_values, ppsz_color_descriptions )
- add_integer( "win32text-rel-fontsize", 16, NULL, FONTSIZER_TEXT,
+ add_integer( "win32text-rel-fontsize", 16, FONTSIZER_TEXT,
FONTSIZER_LONGTEXT, false )
- change_integer_list( pi_sizes, ppsz_sizes_text, NULL );
+ change_integer_list( pi_sizes, ppsz_sizes_text )
set_capability( "text renderer", 50 )
add_shortcut( "text" )
fmt.p_palette->palette[i][3] = pi_gamma[i];
}
- p_region->p_picture = picture_New( fmt.i_chroma, fmt.i_width, fmt.i_height, fmt.i_aspect );
+ p_region->p_picture = picture_NewFromFormat( &fmt );
if( !p_region->p_picture )
{
free( fmt.p_palette );
int i, i_width, i_height;
HBITMAP bitmap, bitmap_bak;
BITMAPINFO *p_bmi;
- RECT rect = {0};
- SIZE size;
+ RECT rect = { 0, 0, 0, 0 };
/* Sanity check */
if( !p_region_in || !p_region_out ) return VLC_EGENERIC;
+ if( !p_region_in->psz_text || !*p_region_in->psz_text )
+ return VLC_EGENERIC;
+
psz_string = malloc( (strlen( p_region_in->psz_text )+1) * sizeof(TCHAR) );
if( !psz_string )
return VLC_ENOMEM;
SetTextColor( p_sys->hcdc, RGB( (i_font_color >> 16) & 0xff,
(i_font_color >> 8) & 0xff, i_font_color & 0xff) );
- GetTextExtentPoint( p_sys->hcdc, psz_string, _tcslen(psz_string), &size );
- i_width = rect.right = size.cx; i_height = rect.bottom = size.cy;
+ DrawText( p_sys->hcdc, psz_string, -1, &rect,
+ DT_CALCRECT | DT_CENTER | DT_NOPREFIX );
+ i_width = rect.right; i_height = rect.bottom;
p_bmi = malloc(sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD)*16);
memset( p_bmi, 0, sizeof(BITMAPINFOHEADER) );
bitmap_bak = SelectObject( p_sys->hcdc, bitmap );
FillRect( p_sys->hcdc, &rect, (HBRUSH)GetStockObject(BLACK_BRUSH) );
- //TextOut( p_sys->hcdc, 0, 0, psz_string, strlen(psz_string) );
- if( !DrawText( p_sys->hcdc, psz_string, -1, &rect, 0 ) )
+ if( !DrawText( p_sys->hcdc, psz_string, -1, &rect,
+ DT_CENTER | DT_NOPREFIX ) )
{
msg_Err( p_filter, "could not draw text" );
}